changeset 314:80b52f5e97b6 lifetime

Structure without common root dir
author maxter <spambox@d-coding.com>
date Wed, 23 Dec 2009 23:17:36 +0200
parents cb7fb9195175
children 2049c3abd348
files CMakeLists.txt Makefile build/core.makefile build/core.txt build/gui.makefile build/gui.txt build/network.makefile build/opengl.makefile build/opengl.txt build/posix.makefile build/rm.d build/rm.exe build/svg.makefile build/webkit.makefile build/windows.makefile build/xml.makefile d1/qt/QGlobal.d d1/qt/core/QVariant.d d1/qtd/Array.d d1/qtd/ArrayOpsPrimitive.d d1/qtd/QtdObject.d d1/qtd/Signal.d d1/qtd/Traits.d d2/qt/QGlobal.d d2/qt/core/QMetaObject.d d2/qt/core/QVariant.d d2/qtd/Array.d d2/qtd/ArrayOpsPrimitive.d d2/qtd/Core.d d2/qtd/Memory.d d2/qtd/QtdObject.d d2/qtd/Signal.d generator/cppimplgenerator.cpp generator/dgenerator.cpp generator/typesystem_core.xml generator/typesystem_gui-java.java generator/typesystem_gui.xml
diffstat 37 files changed, 318 insertions(+), 1252 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt	Wed Dec 23 16:58:17 2009 +0200
+++ b/CMakeLists.txt	Wed Dec 23 23:17:36 2009 +0200
@@ -42,14 +42,14 @@
 
 if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT OR "${CMAKE_INSTALL_PREFIX}" STREQUAL "")
     set(CMAKE_INSTALL_PREFIX
-	${DC_PATH} CACHE PATH "QtD install prefix"
+    ${DC_PATH} CACHE PATH "QtD install prefix"
     )
 endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT OR "${CMAKE_INSTALL_PREFIX}" STREQUAL "")
 
 # Check D compiler version
 if(D_VERSION EQUAL "1")
     if (D_FRONTEND LESS "041")
-	message(STATUS "Minimum required version of D compiler is 1.041 (or compiler based on this version)")
+    message(STATUS "Minimum required version of D compiler is 1.041 (or compiler based on this version)")
     endif(D_FRONTEND LESS "041")
     set(D_TARGET d1-tango CACHE INTERNAL "")   
 elseif(D_VERSION EQUAL "2")
@@ -78,7 +78,7 @@
     set(implib implib)
     find_program(IMPLIB ${implib})
     if (NOT IMPLIB)
-	message(FATAL_ERROR "implib is not found. You can donwload it from http://ftp.digitalmars.com/bup.zip")
+    message(FATAL_ERROR "implib is not found. You can donwload it from http://ftp.digitalmars.com/bup.zip")
     endif (NOT IMPLIB)
     if(D_IS_MARS)
       set(GEN_OPT ${GEN_OPT} --cpp_shared)
@@ -95,7 +95,7 @@
     string(TOUPPER ${package_big} package_upper) 
     option(BUILD_QT_${package_upper} "Build Qt${package_big}" "ON")
     if(BUILD_QT_${package_upper})
-	set(packages ${packages} ${package})
+    set(packages ${packages} ${package})
     endif(BUILD_QT_${package_upper})
 endforeach(package_big ${all_packages})
 
@@ -120,18 +120,18 @@
 endif(${CMAKE_BINARY_DIR} STREQUAL ${CMAKE_SOURCE_DIR})
 
 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}
-	COMMENT ""	
-	)  
+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}
+    COMMENT ""  
+    )  
 
 ## Make commands.
 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
-	COMMENT ""
-	)  
+    COMMAND cd ${CMAKE_BINARY_DIR}/build && ${make_util} install
+    COMMENT ""
+    )  
 add_dependencies(install preinstall)
 
 ##--------------------------------------------
@@ -206,35 +206,35 @@
     set (params NAME OPTIONS)
     qtd_parse_params (RESOURCES  params ${ARGN})
     if(NAME_tmp)
-	set(OPTIONS_tmp ${OPTIONS_tmp} -name ${NAME_tmp})
+    set(OPTIONS_tmp ${OPTIONS_tmp} -name ${NAME_tmp})
     endif(NAME_tmp)
     qtd_command ("${output}" "${DRCC}" "${OPTIONS_tmp}" "qrc_" 
-	"Generate" ${RESOURCES_tmp})
+    "Generate" ${RESOURCES_tmp})
 endmacro(qtd_add_resource output)
 
 macro(qtd_wrap_ui output)
     set (params OPTIONS)
     qtd_parse_params (UI params ${ARGN})
     qtd_command ("${output}" "${DUIC}" "${OPTIONS_tmp}"  "uic_" 
-	"Generate" ${UI_tmp})
+    "Generate" ${UI_tmp})
 endmacro(qtd_wrap_ui output)
 
 macro(qtd_command output command options prefix comment)
     foreach(file "${ARGN}")
-	## Test an exist of the input file.
-	get_filename_component(file_path ${file} PATH)
-	get_filename_component(file_name ${file} NAME_WE)
-	get_filename_component(file_ext ${file} EXT)
+    ## Test an exist of the input file.
+    get_filename_component(file_path ${file} PATH)
+    get_filename_component(file_name ${file} NAME_WE)
+    get_filename_component(file_ext ${file} EXT)
 
-	set(out ${CMAKE_CURRENT_BINARY_DIR}/${file_path}${prefix}${file_name}.d)
-	add_custom_command(OUTPUT "${out}"
-		    COMMAND "${command}"
-		    ARGS ${options} ${file} -o ${out} 
-		    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-		    DEPENDS ${file}
-		    COMMENT "${comment} ${file}"
-		    )
-	set(${output} ${${output}} ${out})
+    set(out ${CMAKE_CURRENT_BINARY_DIR}/${file_path}${prefix}${file_name}.d)
+    add_custom_command(OUTPUT "${out}"
+            COMMAND "${command}"
+            ARGS ${options} ${file} -o ${out} 
+            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+            DEPENDS ${file}
+            COMMENT "${comment} ${file}"
+            )
+    set(${output} ${${output}} ${out})
     endforeach(file "${ARGN}")
 endmacro(qtd_command output command options files prefix comment)
 
@@ -242,81 +242,81 @@
 macro(qtd_parse_params default params)
     set(type_tmp ${default})
     set(params_tmp ${default} ${${params}})  
-    foreach(param_tmp ${params_tmp})	
-	set(${param_tmp}_tmp )
+    foreach(param_tmp ${params_tmp})    
+    set(${param_tmp}_tmp )
     endforeach(param_tmp ${params_tmp})
     foreach(arg_tmp ${ARGN})
-	set(found_type_tmp)
-	if(NOT found_type_tmp)
-	    foreach(param_tmp ${params_tmp})
-		if(arg_tmp STREQUAL param_tmp)	
-		    set(type_tmp ${param_tmp})
-		    set(found_type_tmp 1)
-		    break(param_tmp ${params_tmp})
-		endif(arg_tmp STREQUAL param_tmp)
-	    endforeach(param_tmp ${params_tmp})	
-	endif(NOT found_type_tmp)
-	if(NOT found_type_tmp)
-	    set(${type_tmp}_tmp ${${type_tmp}_tmp} ${arg_tmp})
-	endif(NOT found_type_tmp)
+    set(found_type_tmp)
+    if(NOT found_type_tmp)
+        foreach(param_tmp ${params_tmp})
+        if(arg_tmp STREQUAL param_tmp)  
+            set(type_tmp ${param_tmp})
+            set(found_type_tmp 1)
+            break(param_tmp ${params_tmp})
+        endif(arg_tmp STREQUAL param_tmp)
+        endforeach(param_tmp ${params_tmp}) 
+    endif(NOT found_type_tmp)
+    if(NOT found_type_tmp)
+        set(${type_tmp}_tmp ${${type_tmp}_tmp} ${arg_tmp})
+    endif(NOT found_type_tmp)
     endforeach(arg_tmp ${ARGN})
 endmacro(qtd_parse_params default)
 
 ## Build example macro.
 ## name -- example name.
 ## Options:
-##	PACKAGES -- list of packages to link to exaple (for example, QtCore QtGui QtOpenGL).
-##		Default value is "QtCore QtGui".
+##  PACKAGES -- list of packages to link to exaple (for example, QtCore QtGui QtOpenGL).
+##      Default value is "QtCore QtGui".
 ## params -- sources d files.
 ## Usage:
-##	build_example(ExampleName PACKAGES QtCore QtGui QtXml  main.d another_d_file.d)
+##  build_example(ExampleName PACKAGES QtCore QtGui QtXml  main.d another_d_file.d)
 macro(build_example name)
     set (params UIC RESOURCES PACKAGES)
     qtd_parse_params (SOURCES params ${ARGN})
 
     if(NOT PACKAGES_tmp)
-	set(PACKAGES_tmp QtCore QtGui)
+    set(PACKAGES_tmp QtCore QtGui)
     endif(NOT PACKAGES_tmp)
  
     if(RESOURCES_tmp)
-	if(NOT BUILD_TOOLS)
-	    message(STATUS "Example '${name}' requires drcc. Example will not build")
-	    return(build_example name)
-	endif(NOT BUILD_TOOLS)
-	qtd_add_resource(res_sources ${RESOURCES_tmp} NAME ${name} )
+    if(NOT BUILD_TOOLS)
+        message(STATUS "Example '${name}' requires drcc. Example will not build")
+        return(build_example name)
+    endif(NOT BUILD_TOOLS)
+    qtd_add_resource(res_sources ${RESOURCES_tmp} NAME ${name} )
     endif(RESOURCES_tmp)
 
     if(UIC_tmp)
-	if(NOT BUILD_TOOLS)
-	    message(STATUS "Example '${name}' requires drcc. Example will not build")
-	    return(build_example name)
-	endif(NOT BUILD_TOOLS)
-	qtd_wrap_ui(uic_sources ${UIC_tmp})
+    if(NOT BUILD_TOOLS)
+        message(STATUS "Example '${name}' requires drcc. Example will not build")
+        return(build_example name)
+    endif(NOT BUILD_TOOLS)
+    qtd_wrap_ui(uic_sources ${UIC_tmp})
     endif(UIC_tmp)
 
     foreach(package ${PACKAGES_tmp})
-	string(REGEX REPLACE "Qt([A-Za-z0-9])" "\\1" req "${package}")
-	set(is_founded)
-	foreach(package_big ${packages_big})
-	    string(TOLOWER ${package_big} package)  		
-	    if(${req} STREQUAL ${package_big})		
-		set(is_founded 1)
-		break(package_big ${packages_big})
-	    endif(${req} STREQUAL ${package_big})
-	endforeach(package_big ${packages_big})
-	if(NOT is_founded)
-	      message(STATUS "Example '${name}' requires the package '${req}', but it is not active. Example will not build")
-	      return(build_example name)
-	else(NOT is_founded)
-	      set(qtd_libs ${${package}_lib_param} ${qtd_libs})
-	endif(NOT is_founded)	
+    string(REGEX REPLACE "Qt([A-Za-z0-9])" "\\1" req "${package}")
+    set(is_founded)
+    foreach(package_big ${packages_big})
+        string(TOLOWER ${package_big} package)          
+        if(${req} STREQUAL ${package_big})      
+        set(is_founded 1)
+        break(package_big ${packages_big})
+        endif(${req} STREQUAL ${package_big})
+    endforeach(package_big ${packages_big})
+    if(NOT is_founded)
+          message(STATUS "Example '${name}' requires the package '${req}', but it is not active. Example will not build")
+          return(build_example name)
+    else(NOT is_founded)
+          set(qtd_libs ${${package}_lib_param} ${qtd_libs})
+    endif(NOT is_founded)   
     endforeach(package ${PACKAGES_tmp})
     add_d_program(${name} ${SOURCES_tmp} NO_DEPS_SOURCES ${res_sources} ${uic_sources}
-	DEPENDS ${res_sources} INCLUDES ${QTD_IMPORT_PATH} ${CMAKE_CURRENT_BINARY_DIR}
-	LIB_PATHS ${QTD_LIBRARIES_PATH} ${CMAKE_SOURCE_DIR}/lib LIBS ${qtd_libs})
+    DEPENDS ${res_sources} INCLUDES ${QTD_IMPORT_PATH} ${CMAKE_CURRENT_BINARY_DIR}
+    LIB_PATHS ${QTD_LIBRARIES_PATH} ${CMAKE_SOURCE_DIR}/lib LIBS ${qtd_libs})
     ## TODO: Enable.
     #if(STRIP AND ${CMAKE_BUILD_TYPE} EQUAL "Release" AND CMAKE_HOST_UNIX) ##
-    #	add_custom_command(TARGET example_${name} POST_BUILD COMMAND "${STRIP}" ARGS "${output}")
+    #   add_custom_command(TARGET example_${name} POST_BUILD COMMAND "${STRIP}" ARGS "${output}")
     #endif(STRIP AND ${CMAKE_BUILD_TYPE} EQUAL "Release" AND CMAKE_HOST_UNIX)
     add_dependencies(examples ${name})
     add_dependencies(${name} allpackages tools)
@@ -343,206 +343,206 @@
     set(link_d)
     set(cpp_files)
     set(cpp_generated_files)
-    set(d_files)
+    set(d_qt_files)
+    set(d_qtd_files)
+    set(d_generated_files)
     set(classes)
-    set(d_generated_files)
-    set(d_version_files)
     set(link_example)
     include (${CMAKE_SOURCE_DIR}/build/${package}.txt)    
 
     set(all_req_found 1)
     string(TOUPPER ${package} package_upper)
     if(BUILD_QT_${package_upper})
-	foreach(req ${required})
-	    set(req_found)
-	    foreach(pack ${packages_big})
-		if(${pack} STREQUAL ${req})
-		    set(req_found 1)
-		endif(${pack} STREQUAL ${req})
-	    endforeach(pack ${packages})	
-	    if(NOT req_found)
-		set(req_found)
-		foreach(pack ${all_packages})
-		    if(${pack} STREQUAL ${req})
-			set(req_found 1)
-		    endif(${pack} STREQUAL ${req})
-		endforeach(pack ${all_packages})
-		if(req_found)
-		    message(STATUS "Package '${package_big}' requires '${req}', but it is not active")
-		else(req_found)
-		    message(STATUS "Package '${package_big}' requires '${req}', but it is not found")
-		endif(req_found)
-		set(all_req_found)
-	    endif(NOT req_found)
-	endforeach(req ${required})
+    foreach(req ${required})
+        set(req_found)
+        foreach(pack ${packages_big})
+        if(${pack} STREQUAL ${req})
+            set(req_found 1)
+        endif(${pack} STREQUAL ${req})
+        endforeach(pack ${packages})    
+        if(NOT req_found)
+        set(req_found)
+        foreach(pack ${all_packages})
+            if(${pack} STREQUAL ${req})
+            set(req_found 1)
+            endif(${pack} STREQUAL ${req})
+        endforeach(pack ${all_packages})
+        if(req_found)
+            message(STATUS "Package '${package_big}' requires '${req}', but it is not active")
+        else(req_found)
+            message(STATUS "Package '${package_big}' requires '${req}', but it is not found")
+        endif(req_found)
+        set(all_req_found)
+        endif(NOT req_found)
+    endforeach(req ${required})
     else(BUILD_QT_${package_upper})
-	set(all_req_found)
+    set(all_req_found)
     endif(BUILD_QT_${package_upper})
     
     ## TODO: cleanup. 
     if("${all_req_found}" EQUAL 1)
-	set(packages_big ${packages_big} ${package_big})
-	set(packages ${packages} ${package})
-	## Loading package sources list.
-	foreach(d_source ${package}/ArrayOps2 ${d_generated_files})
-	    set(d_sources ${d_sources} ${CMAKE_BINARY_DIR}/qt/${d_source}.d)
-	endforeach(d_source ${d_generated_files})
-	set(classes ArrayOps ${classes})
-	foreach(class ${classes})
-	    set(d_sources ${d_sources} ${CMAKE_BINARY_DIR}/qt/${package}/${class}.d)
-	    set(aux_name ${CMAKE_BINARY_DIR}/qt/${package}/${class}_aux.d )
-            if(EXISTS ${aux_name})
-	        set(d_sources ${d_sources} ${aux_name})
-	    endif(EXISTS ${aux_name})
-	    set(cpp_sources ${cpp_sources} ${CMAKE_BINARY_DIR}/cpp/qt_${package}/${class}_shell.cpp) 
-	endforeach(class ${classes})
-	set(files_for_gen ${files_for_gen} ${cpp_sources} ${d_sources})
+    set(packages_big ${packages_big} ${package_big})
+    set(packages ${packages} ${package})
+    ## Loading package sources list.
+    foreach(d_source qt/${package}/ArrayOps2 ${d_generated_files})
+        set(d_sources ${d_sources} ${CMAKE_BINARY_DIR}/${d_source}.d)
+    endforeach(d_source ${d_generated_files})
+    set(classes ArrayOps ${classes})
+    foreach(class ${classes})
+        set(d_sources ${d_sources} ${CMAKE_BINARY_DIR}/qt/${package}/${class}.d)
+        set(aux_name ${CMAKE_BINARY_DIR}/qt/${package}/${class}_aux.d )
+        if(EXISTS ${aux_name})
+            set(d_sources ${d_sources} ${aux_name})
+        endif(EXISTS ${aux_name})
+        set(cpp_sources ${cpp_sources} ${CMAKE_BINARY_DIR}/cpp/qt_${package}/${class}_shell.cpp) 
+    endforeach(class ${classes})
+    set(files_for_gen ${files_for_gen} ${cpp_sources} ${d_sources})
 
-	foreach (cpp_source ${cpp_files})
-	    set(cpp_sources ${cpp_sources} ${CMAKE_SOURCE_DIR}/cpp/${cpp_source}.cpp)
-	endforeach(cpp_source ${cpp_files})
-	foreach (cpp_source ${cpp_generated_files})
-	    set(cpp_sources ${cpp_sources} ${CMAKE_BINARY_DIR}/cpp/${cpp_source}.cpp)
-	endforeach(cpp_source ${cpp_generated_files})
-	foreach(d_source ${d_version_files})
-	    set(d_sources ${d_sources} ${CMAKE_SOURCE_DIR}/qt/d${D_VERSION}/qt/${d_source}.d)
-	endforeach(d_source ${d_version_files})
-	foreach(d_source ${d_files})
-	    set(d_sources ${d_sources} ${CMAKE_SOURCE_DIR}/qt/${d_source}.d)
-	endforeach(d_source ${d_files})
+    foreach (cpp_source ${cpp_files})
+        set(cpp_sources ${cpp_sources} ${CMAKE_SOURCE_DIR}/cpp/${cpp_source}.cpp)
+    endforeach(cpp_source ${cpp_files})
+    foreach (cpp_source ${cpp_generated_files})
+        set(cpp_sources ${cpp_sources} ${CMAKE_BINARY_DIR}/cpp/${cpp_source}.cpp)
+    endforeach(cpp_source ${cpp_generated_files})
+    foreach(d_source ${d_qt_files})
+        set(d_sources ${d_sources} ${CMAKE_SOURCE_DIR}/d${D_VERSION}/qt/${d_source}.d)
+    endforeach(d_source ${d_qt_files})
+    foreach(d_source ${d_qtd_files})
+        set(d_sources ${d_sources} ${CMAKE_SOURCE_DIR}/d${D_VERSION}/qtd/${d_source}.d)
+    endforeach(d_source ${d_qtd_files})
 
-	if(NOT GENERATE_DI_FILES)
-	    foreach(d_source ${d_sources})
-	      get_filename_component(path ${d_source} PATH)
-	      get_filename_component(name ${d_source} NAME_WE)
-	      regex_safe_string(cbd_safe_tmp ${CMAKE_CURRENT_BINARY_DIR})
-	      regex_safe_string(csd_safe_tmp ${CMAKE_CURRENT_SOURCE_DIR})
-	      regex_safe_string(ver_safe_tmp ${CMAKE_CURRENT_SOURCE_DIR}/qt/d${D_VERSION})
-	      set(regexp_str_tmp "(${ver_safe_tmp}/|${cbd_safe_tmp}/|${csd_safe_tmp}/|)(.+)")
-	      string(REGEX REPLACE ${regexp_str_tmp} "\\2" ins_path "${path}") 
-	      install(FILES ${d_source} DESTINATION include/d/${ins_path} COMPONENT qtd RENAME ${name}.di)
-	      install(FILES ${path}/${name}_aux.d DESTINATION include/d/${ins_path} COMPONENT qtd RENAME ${name}_aux.di OPTIONAL)
-	    endforeach(d_source ${d_sources})
-	endif(NOT GENERATE_DI_FILES)
+    if(NOT GENERATE_DI_FILES)
+        foreach(d_source ${d_sources})
+          get_filename_component(path ${d_source} PATH)
+          get_filename_component(name ${d_source} NAME_WE)
+          regex_safe_string(cbd_safe_tmp ${CMAKE_CURRENT_BINARY_DIR})
+          regex_safe_string(csd_safe_tmp ${CMAKE_CURRENT_SOURCE_DIR})
+          regex_safe_string(ver_safe_tmp ${CMAKE_CURRENT_SOURCE_DIR}/qt/d${D_VERSION})
+          set(regexp_str_tmp "(${ver_safe_tmp}/|${cbd_safe_tmp}/|${csd_safe_tmp}/|)(.+)")
+          string(REGEX REPLACE ${regexp_str_tmp} "\\2" ins_path "${path}") 
+          install(FILES ${d_source} DESTINATION include/d/${ins_path} COMPONENT qtd RENAME ${name}.di)
+          install(FILES ${path}/${name}_aux.d DESTINATION include/d/${ins_path} COMPONENT qtd RENAME ${name}_aux.di OPTIONAL)
+        endforeach(d_source ${d_sources})
+    endif(NOT GENERATE_DI_FILES)
 
-	## Link CPP library.
-	if(CPP_SHARED)
-	    set(cpp_method SHARED)
-	else(CPP_SHARED)
-	    set(cpp_method STATIC)
-	endif(CPP_SHARED)
-	add_library(cpp_${package} ${cpp_method} ${cpp_sources})
-	set_property(TARGET cpp_${package} PROPERTY LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/CMakeFiles)
-	if(CPP_SHARED) 
-	else(CPP_SHARED)
-	    foreach(cpp_source ${cpp_sources})
-		set(cpp_source ${cpp_source})
-		obj_path(cpp_source)
-		set(cpp_objs ${cpp_objs} ${CMAKE_BINARY_DIR}/CMakeFiles/cpp_${package}.dir/${cpp_source}${CMAKE_CXX_OUTPUT_EXTENSION})
-	    endforeach(cpp_source ${cpp_sources})
-	endif(CPP_SHARED)
+    ## Link CPP library.
+    if(CPP_SHARED)
+        set(cpp_method SHARED)
+    else(CPP_SHARED)
+        set(cpp_method STATIC)
+    endif(CPP_SHARED)
+    add_library(cpp_${package} ${cpp_method} ${cpp_sources})
+    set_property(TARGET cpp_${package} PROPERTY LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/CMakeFiles)
+    if(CPP_SHARED) 
+    else(CPP_SHARED)
+        foreach(cpp_source ${cpp_sources})
+        set(cpp_source ${cpp_source})
+        obj_path(cpp_source)
+        set(cpp_objs ${cpp_objs} ${CMAKE_BINARY_DIR}/CMakeFiles/cpp_${package}.dir/${cpp_source}${CMAKE_CXX_OUTPUT_EXTENSION})
+        endforeach(cpp_source ${cpp_sources})
+    endif(CPP_SHARED)
 
-	## Link D library.
-	set(lib_name qtd${package})
-	if(BUILD_SHARED_LIBRARIES)
-	    set(lib lib/${CMAKE_SHARED_LIBRARY_PREFIX}${lib_name}${CMAKE_SHARED_LIBRARY_SUFFIX})
-	    set(build_type SHARED)
-	else(BUILD_SHARED_LIBRARIES)
-	    set(lib lib/${D_LIB_PREFIX}${lib_name}${D_LIB_SUFFIX})
-	    set(build_type STATIC)
-	endif(BUILD_SHARED_LIBRARIES)
+    ## Link D library.
+    set(lib_name qtd${package})
+    if(BUILD_SHARED_LIBRARIES)
+        set(lib lib/${CMAKE_SHARED_LIBRARY_PREFIX}${lib_name}${CMAKE_SHARED_LIBRARY_SUFFIX})
+        set(build_type SHARED)
+    else(BUILD_SHARED_LIBRARIES)
+        set(lib lib/${D_LIB_PREFIX}${lib_name}${D_LIB_SUFFIX})
+        set(build_type STATIC)
+    endif(BUILD_SHARED_LIBRARIES)
 
-	foreach(req ${required})
-		set(is_found)
-		foreach(pack ${packages_big})
-		    if("${pack}" STREQUAL "${req}")
-			set(is_found 1)
-			break(pack ${packages_big})
-		    endif("${pack}" STREQUAL "${req}")
-		endforeach(pack ${packages_big})
-		if(NOT is_found)
-		    message(FATAL_ERROR "Package ${package_big} requires ${req}, but it is not found")
-		endif(NOT is_found)
-		string(TOUPPER ${req} req_upper)
-		string(TOLOWER ${req} req_lower)
-		set(link_cpp ${link_cpp} cpp_${req_lower} ${QT_QT${req_upper}_LIBRARY})
-	    endforeach(req ${require})
-	set(d_objs ${d_objs} ${objects}) 
+    foreach(req ${required})
+        set(is_found)
+        foreach(pack ${packages_big})
+            if("${pack}" STREQUAL "${req}")
+            set(is_found 1)
+            break(pack ${packages_big})
+            endif("${pack}" STREQUAL "${req}")
+        endforeach(pack ${packages_big})
+        if(NOT is_found)
+            message(FATAL_ERROR "Package ${package_big} requires ${req}, but it is not found")
+        endif(NOT is_found)
+        string(TOUPPER ${req} req_upper)
+        string(TOLOWER ${req} req_lower)
+        set(link_cpp ${link_cpp} cpp_${req_lower} ${QT_QT${req_upper}_LIBRARY})
+        endforeach(req ${require})
+    set(d_objs ${d_objs} ${objects}) 
 
-	set_property(TARGET cpp_${package} PROPERTY RUNTIME_OUTPUT_DIRECTORY lib)
-	set_property(TARGET cpp_${package} PROPERTY ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/CMakeFiles)
-	string(TOUPPER ${package} package_upper)
-	set(link_cpp ${link_cpp} ${QT_QT${package_upper}_LIBRARY})
-	target_link_libraries(cpp_${package} ${link_cpp} )	
-	if(CPP_SHARED)
-	    set(cpp_lib ${CMAKE_BINARY_DIR}/lib/libcpp_${package}.dll)
-	    set(cpp_lib_native ${cpp_lib})
-	    make_native_path(cpp_lib_native)
-	    set(d_implib ${CMAKE_BINARY_DIR}/CMakeFiles/${package}.dir/cpp_${package}.lib)
-	    set(d_implib_native ${d_implib})
-	    make_native_path(d_implib_native)
-	    add_custom_command(
-			OUTPUT "${d_implib}"
-			COMMAND "${IMPLIB}"
-			ARGS  /system /PAGESIZE:32 ${d_implib_native} ${cpp_lib_native}
-			DEPENDS  "cpp_${package}"
-			COMMENT "Creating implib ${lib_name}"
-		    )
-	    install(FILES ${cpp_lib} COMPONENT qtd DESTINATION lib)
-	else(CPP_SHARED)
-	    set(${package}_lib_param Qt${package_big}) ## Paths for QtD libs. Needed by examples.
-	endif(CPP_SHARED) 
-	add_d_target(${lib_name} NOT_DETECT_DEPENDS TYPE ${build_type} INCLUDES ${QTD_IMPORT_PATH} SOURCES ${d_sources} OBJECTS ${cpp_objs} ${d_implib}
-	      OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib DEPENDS ${d_implib} )
-	
-	install(FILES ${CMAKE_BINARY_DIR}/${lib} COMPONENT qtd DESTINATION lib)	
-	## Paths for QtD libs. Needed by examples.
-	set(${package}_lib_param qtd${package} ${${package}_lib_param} ${link_example})
+    set_property(TARGET cpp_${package} PROPERTY RUNTIME_OUTPUT_DIRECTORY lib)
+    set_property(TARGET cpp_${package} PROPERTY ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/CMakeFiles)
+    string(TOUPPER ${package} package_upper)
+    set(link_cpp ${link_cpp} ${QT_QT${package_upper}_LIBRARY})
+    target_link_libraries(cpp_${package} ${link_cpp} )  
+    if(CPP_SHARED)
+        set(cpp_lib ${CMAKE_BINARY_DIR}/lib/libcpp_${package}.dll)
+        set(cpp_lib_native ${cpp_lib})
+        make_native_path(cpp_lib_native)
+        set(d_implib ${CMAKE_BINARY_DIR}/CMakeFiles/${package}.dir/cpp_${package}.lib)
+        set(d_implib_native ${d_implib})
+        make_native_path(d_implib_native)
+        add_custom_command(
+            OUTPUT "${d_implib}"
+            COMMAND "${IMPLIB}"
+            ARGS  /system /PAGESIZE:32 ${d_implib_native} ${cpp_lib_native}
+            DEPENDS  "cpp_${package}"
+            COMMENT "Creating implib ${lib_name}"
+            )
+        install(FILES ${cpp_lib} COMPONENT qtd DESTINATION lib)
+    else(CPP_SHARED)
+        set(${package}_lib_param Qt${package_big}) ## Paths for QtD libs. Needed by examples.
+    endif(CPP_SHARED) 
+    add_d_target(${lib_name} NOT_DETECT_DEPENDS TYPE ${build_type} INCLUDES ${QTD_IMPORT_PATH} SOURCES ${d_sources} OBJECTS ${cpp_objs} ${d_implib}
+          OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib DEPENDS ${d_implib} )
+    
+    install(FILES ${CMAKE_BINARY_DIR}/${lib} COMPONENT qtd DESTINATION lib) 
+    ## Paths for QtD libs. Needed by examples.
+    set(${package}_lib_param qtd${package} ${${package}_lib_param} ${link_example})
 
-	## Dependences.
-	add_custom_target(${package})
-	add_dependencies(${package} ${lib_name})
-	add_dependencies(${lib_name} cpp_${package})
-	foreach(depend ${required})
-	    string(TOLOWER ${depend} depend)
-	    add_dependencies(cpp_${package} cpp_${depend})
-	    add_dependencies(${package} ${depend})
-	endforeach(depend ${required})
-	add_dependencies(allpackages ${package})
+    ## Dependences.
+    add_custom_target(${package})
+    add_dependencies(${package} ${lib_name})
+    add_dependencies(${lib_name} cpp_${package})
+    foreach(depend ${required})
+        string(TOLOWER ${depend} depend)
+        add_dependencies(cpp_${package} cpp_${depend})
+        add_dependencies(${package} ${depend})
+    endforeach(depend ${required})
+    add_dependencies(allpackages ${package})
 
-	if(GENERATE_DI_FILES)
-	  regexseafestring(cbd_safe ${CMAKE_BINARY_DIR})
-	  regexseafestring(csd_safe ${CMAKE_SOURCE_DIR})
-	  set(regexp_str "(${csd}/qt/d${D_VERSION}|${csd_safe}|${cbd_safe})/([A-Za-z0-9\\-_\\\\/]+)[/]+([A-Za-z0-9\\-_\\\\]+).d")
-	  foreach(source ${d_sources})
-      # 	find_file(source ${source} PATHS ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
-      # 		  ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR})
-	      string(REGEX REPLACE ${regexp_str} "\\2" inc_path "${source}")
-	      string(REGEX REPLACE ${regexp_str} "\\3" file_name "${source}")
-	      set(interface_file_path ${CMAKE_BINARY_DIR}/d/${inc_path})
-	      set(interface_file "${interface_file_path}/${file_name}.di")
-	      if(NOT "${file_name}" STREQUAL "QGlobal")
-		  add_custom_command(OUTPUT "${interface_file}"
-			      COMMAND "${DC}"
-			      ARGS ${D_FLAGS} -o- -H -Hd${interface_file_path} ${source}
-			      COMMENT "Generating header for ${source}"
-			      DEPENDS ${source}
-			      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-			      )		   
-	      else(NOT "${file_name}" STREQUAL "QGlobal") ## The DMD frontend crashes on this file.
-		  add_custom_command(OUTPUT "${interface_file}"
-			      COMMAND ${CMAKE_COMMAND} -E make_directory ${interface_file_path}
-			      COMMAND ${CMAKE_COMMAND} -E remove -f ${interface_file}
-			      COMMAND ${CMAKE_COMMAND} -E copy ${source} ${interface_file}
-			      COMMENT ""
-			      DEPENDS ${source}
-			      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-			      )	    
-	      endif(NOT "${file_name}" STREQUAL "QGlobal" AND GENERATE_DI_FILES)
-	      set(interfaces_list ${interfaces_list} ${interface_file_path}/${file_name}.di) 
-	      install(FILES ${interface_file} COMPONENT qtd DESTINATION include/d/${inc_path})
-	  endforeach(source)
-	endif(GENERATE_DI_FILES)
+    if(GENERATE_DI_FILES)
+      regexseafestring(cbd_safe ${CMAKE_BINARY_DIR})
+      regexseafestring(csd_safe ${CMAKE_SOURCE_DIR})
+      set(regexp_str "(${csd}/qt/d${D_VERSION}|${csd_safe}|${cbd_safe})/([A-Za-z0-9\\-_\\\\/]+)[/]+([A-Za-z0-9\\-_\\\\]+).d")
+      foreach(source ${d_sources})
+      #     find_file(source ${source} PATHS ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
+      #           ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR})
+          string(REGEX REPLACE ${regexp_str} "\\2" inc_path "${source}")
+          string(REGEX REPLACE ${regexp_str} "\\3" file_name "${source}")
+          set(interface_file_path ${CMAKE_BINARY_DIR}/d/${inc_path})
+          set(interface_file "${interface_file_path}/${file_name}.di")
+          if(NOT "${file_name}" STREQUAL "QGlobal")
+          add_custom_command(OUTPUT "${interface_file}"
+                  COMMAND "${DC}"
+                  ARGS ${D_FLAGS} -o- -H -Hd${interface_file_path} ${source}
+                  COMMENT "Generating header for ${source}"
+                  DEPENDS ${source}
+                  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                  )        
+          else(NOT "${file_name}" STREQUAL "QGlobal") ## The DMD frontend crashes on this file.
+          add_custom_command(OUTPUT "${interface_file}"
+                  COMMAND ${CMAKE_COMMAND} -E make_directory ${interface_file_path}
+                  COMMAND ${CMAKE_COMMAND} -E remove -f ${interface_file}
+                  COMMAND ${CMAKE_COMMAND} -E copy ${source} ${interface_file}
+                  COMMENT ""
+                  DEPENDS ${source}
+                  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                  )     
+          endif(NOT "${file_name}" STREQUAL "QGlobal" AND GENERATE_DI_FILES)
+          set(interfaces_list ${interfaces_list} ${interface_file_path}/${file_name}.di) 
+          install(FILES ${interface_file} COMPONENT qtd DESTINATION include/d/${inc_path})
+      endforeach(source)
+    endif(GENERATE_DI_FILES)
     endif("${all_req_found}" EQUAL 1)
 endforeach(package_big ${packages_big})
 if(GENERATE_DI_FILES) 
--- a/Makefile	Wed Dec 23 16:58:17 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,233 +0,0 @@
-## TODO: CPP_SHARED is very experemental on posix.
-## TODO: "make clean" don`t work as expected.
-## TODO: add target "install"
-## TODO: delete 'lib' prefix from output library name under windows.
-
-## Read variable from shell.
-export QTDIR
-export QTDIR_INC
-export QTDIR_LIB
-## End. Read variable from shell.
-
-## Try identify system.
-ifeq ($(strip $(shell uname)),Linux)
-	SYSTEM=posix
-else
-	ifeq ($(strip $(shell uname)),Darwin)
-		SYSTEM=posix
-	else
-		SYSTEM=windows
-	endif
-endif
-## End, Try identify system.
-
-## Load system specify settings.
-include build/$(SYSTEM).makefile
-
-## Main settings.
-## D compiler.
-ifndef $(DC)
-DC = dmd
-endif
-## C++ compiler.
-ifndef $(CC)
-CC = g++
-endif
-## Archiver.
-ifndef $(AR)
-AR = ar
-endif
-## Set default target.
-ifndef $(BUILD_TYPE)
-BUILD_TYPE = release
-endif
-
-## Tmp path.
-ifndef $(TMP_PATH)
-TMP_PATH_ = tmp
-TMP_PATH = $(TMP_PATH_)$(SL)$(BUILD_TYPE)
-endif
-## Output path.
-ifndef $(OUTPUT_PATH)
-OUTPUT_PATH = lib
-endif
-## Prefix for lib name.
-ifndef $(NAME_PREFIX)
-NAME_PREFIX = qtd
-endif
-
-ifndef $(PACKAGES)
-PACKAGES = core gui
-endif
-
-ifeq ($(DMD_WIN), false)
-LIB_PREFIX = lib
-endif
-
-CC_INCLUDE += include $(QTDIR_INC) $(QTDIR_INC)$(SL)Qt $(QTDIR_INC)$(SL)QtCore $(QTDIR_INC)$(SL)QtGui $(QTDIR_INC)$(SL)QtOpenGL $(QTDIR_INC)$(SL)QtSvg
-D_INCLUDE +=
-CC_LFLAGS += -enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc -Wl,-s -mthreads
-CC_CFLAGS +=
-D_CFLAGS +=
-CC_LIB_PATH += $(QTDIR_LIB) $(TMP_PATH)
-D_LIB_PATH += $(TMP_PATH)
-
-## D target
-ifndef D_TARGET
-D_TARGET = d1-tango
-endif
-
-ifeq ($(D_TARGET), d1-tango)
-D_VERSION = 1
-else
-D_VERSION = 2
-endif
-D_CFLAGS += -Iqt/d$(D_VERSION)
-
-#End. Main settings.
-
-## Flags for debug version.
-ifeq ($(BUILD_TYPE), debug)
-CC_CFLAGS += -O0
-D_CFLAGS += -debug -g -gc
-LIB_POSTFIX = d
-else ifeq ($(BUILD_TYPE), release)
-## End. Flags for debug version.
-## Flags for release version
-CC_CFLAGS += -O
-D_CFLAGS += -O -release -inline
-endif
-## End. Flags for release version.
-
-## Load classes list.
-## param 1 - package name.
-define MODULE_template
-    include build/$(1).makefile
-    qt_$(1)_lib_name = $$(qt_$(1)_name)$(QT_LIB_POSTFIX)
-    $(1)_cpp_files += $$($(1)_classes:%=cpp/qt_$(1)/%_shell.cpp)
-    $(1)_cpp_obj_files = $$($(1)_cpp_files:cpp/%.cpp=$(TMP_PATH)/%.o)
-    $(1)_d_files += $$($(1)_classes:%=qt/$(1)/%.d)
-endef
-$(foreach package,$(PACKAGES),$(eval $(call MODULE_template,$(package))))
-## End. Load classes list
-
-## DMD compile template bug fix
-ifeq ($(DC), dmd)
-NOT_SEPARATE_D_OBJ = true
-endif
-
-ifeq ($(SYSTEM), windows)
-	ifeq ($(DC), dmd)
-		DMD_WIN = true
-	endif
-endif
-
-ifeq ($(DMD_WIN), true)
-	CPP_SHARED = true
-	LIB_EXT = lib
-else
-	LIB_EXT = a
-endif
-
-## CPP_SHARED options.
-ifeq ($(CPP_SHARED), true)
-CC_CFLAGS += -DCPP_SHARED
-GEN_OPT   += --cpp_shared
-D_CFLAGS += -version=cpp_shared
-endif
-## End. CPP_SHARED options.
-
-all: dgen build
-
-windows:
-	$(MAKE) SYSTEM=windows
-
-posix:
-	$(MAKE) SYSTEM=posix
-
-release: all
-
-debug:
-	$(MAKE) BUILD_TYPE=debug
-
-build: mkdir $(PACKAGES)
-
-## DGenerator
-make_gen:
-	cd generator && qmake && $(MAKE)
-
-dgen:  make_gen
-	cd generator && $(GEN) $(GEN_OPT) --d-target=$(D_TARGET) --output-directory=../ qtjambi_masterinclude.h build_gui.txt
-## DGenerator ## end
-
-mkdir:
-	@$(MKDIR) $(TMP_PATH_)
-	@$(MKDIR) $(TMP_PATH)
-	@$(MKDIR) $(TMP_PATH)$(SL)qt_qtd
-	@$(MKDIR) $(TMP_PATH)$(SL)qtd
-	@$(MKDIR) $(OUTPUT_PATH)
-
-## Build cpp files.
-$(TMP_PATH)/%.o: cpp/%.cpp
-	$(CC) $(CC_CFLAGS) $(CC_INCLUDE:%=-I%) -c $(@:$(TMP_PATH)/%.o=cpp/%.cpp) -o$@
-
-## Build d files.
-$(TMP_PATH)/%_d.o: qt/%.d
-	$(DC) $(D_CFLAGS) -c $(@:$(TMP_PATH)/%_d.o=qt/%.d) -of$@
-
-## Build package.
-## param 1 - package name.
-define BUILD_template
-    ## mkdir
-    mkdir_$(1):
-	    @$(MKDIR) $(TMP_PATH)$(SL)qt_$(1)
-	    @$(MKDIR) $(TMP_PATH)$(SL)$(1)
-    ## End. mkdir
-    ## Build d part.
-    ifeq ($(NOT_SEPARATE_D_OBJ), true)
-    ## DMD compile template bug fix
-    $(1)_D_RULE =$(TMP_PATH)/$(1)_dobj.$(D_OBJ_EXT)
-    $$($(1)_D_RULE):
-	    $(DC) $(D_CFLAGS) $(D_INCLUDE) -c $$($(1)_d_files) -of$$($(1)_D_RULE)
-    else
-    $(1)_D_RULE = $$($(1)_d_files:qt/%.d=$(TMP_PATH)/%_d.o)
-    endif
-    ## End. Build d part.
-    ## Build cpp part.
-    ifeq ($(CPP_SHARED), true)
-    ifeq ($(SYSTEM), windows)
-    $(1)_CPP_DYN_LIB = $(OUTPUT_PATH)$(SL)$(LIB_PREFIX)$(NAME_PREFIX)$(1)$(LIB_POSTFIX).$(DYN_LIB_EXT)
-    $$($(1)_CPP_DYN_LIB): $$($(1)_cpp_obj_files)
-	    $(CC) $(CC_LFLAGS) -shared $$($(1)_cpp_obj_files) -o $$($(1)_CPP_DYN_LIB) $(CC_LIB_PATH:%=-L%) -l$(qt_$(1)_lib_name) $$($(1)_link_cpp:%=-l%) -Wl,--out-implib,$(TMP_PATH)\$(LIB_PREFIX)$(NAME_PREFIX)$(1)_cpp.a
-    $(1)_CPP_RULE = $(TMP_PATH)\cpp_$(1).$(LIB_EXT)
-    $$($(1)_CPP_RULE): $$($(1)_CPP_DYN_LIB)
-	    $(IMPLIB) $$($(1)_CPP_RULE) $$($(1)_CPP_DYN_LIB)
-    else ## CPP_SHARED != true
-    $(1)_CPP_RULE = $(OUTPUT_PATH)$(SL)$(LIB_PREFIX)$(NAME_PREFIX)$(1)$(LIB_POSTFIX).$(DYN_LIB_EXT)
-    $$($(1)_CPP_RULE): $$($(1)_cpp_obj_files)
-	    $(CC) $(CC_LFLAGS) $(QTDIR_LIB)/$(LIB_PREFIX)$(qt_$(1)_name).$(DYN_LIB_EXT) $$($(1)_link_cpp:%=-l%) $$($(1)_cpp_obj_files) -o $$($(1)_CPP_RULE)
-    endif ## CPP_SHARED
-    DELETE_FILES += $$($(1)_CPP_DYN_LIB) $$($(1)_cpp_obj_files) $(TMP_PATH)\$(LIB_PREFIX)$(NAME_PREFIX)$(1)_cpp.a
-    else
-    $(1)_CPP_RULE = $$($(1)_cpp_obj_files)
-    endif
-    ## End. Build cpp part.
-
-    DELETE_FILES += $$($(1)_D_RULE) $$($(1)_CPP_RULE) $(OUTPUT_PATH)/$(LIB_PREFIX)$$(qt_$(1)_name)D.$(LIB_EXT)
-    ## Implib link.
-    $(1)_LIB = $(OUTPUT_PATH)$(SL)$(LIB_PREFIX)$(NAME_PREFIX)$(1)$(LIB_POSTFIX).$(LIB_EXT)
-    ifeq ($(DMD_WIN), true)
-    $$($(1)_LIB): $$($(1)_D_RULE) $$($(1)_CPP_RULE)
-	    $(DC) $$($(1)_D_RULE) $$($(1)_CPP_RULE) $(D_LIB_PATH:%=-L-L%) $$($(1)_link_d:%=-L-l%) -lib -of$$($(1)_LIB)
-    else
-    $$($(1)_LIB): $$($(1)_D_RULE) $$($(1)_CPP_RULE)
-	    $(AR) rcs $$($(1)_LIB) $$($(1)_D_RULE) $$($(1)_CPP_RULE)
-    endif
-    # End. Implib link.
-    $(1): mkdir_$(1) $$($(1)_LIB)
-endef
-$(foreach package,$(PACKAGES),$(eval $(call BUILD_template,$(package))))
-## End. Build package.
-
-clean:
-	@$(RM) $(DELETE_FILES)
--- a/build/core.makefile	Wed Dec 23 16:58:17 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-ifeq ($(D_VERSION), 1)
-D_PATH = d1/qt
-else
-D_PATH = d2/qt
-endif
-
-##--------------------------
-QTD_CORE += QGlobal $(D_PATH)/qtd/Str core/Qt qtd/ArrayOpsPrimitive $(D_PATH)/QtdObject $(D_PATH)/Signal \
-$(D_PATH)/core/QPoint \
-$(D_PATH)/core/QPointF \
-$(D_PATH)/core/QRect \
-$(D_PATH)/core/QRectF \
-$(D_PATH)/core/QSize \
-$(D_PATH)/core/QSizeF \
-$(D_PATH)/core/QLine \
-$(D_PATH)/core/QLineF \
-$(D_PATH)/core/QModelIndex \
-$(D_PATH)/core/QVariant
-
-##--------------------------
-
-## Qt Lib name.
-qt_core_name = QtCore
-
-## Libraries linked to the cpp part (is active only when  CPP_SHARED == true).
-core_link_cpp += 
-
-## Libraries linked to the d part (is active only when  CPP_SHARED == true)..
-core_link_d += 
-
-## Module specific cpp files.
-core_cpp_files += cpp/qt_qtd/qtd_core.cpp cpp/qt_qtd/ArrayOpsPrimitive_shell.cpp \
-cpp/qt_core/QPoint_shell.cpp cpp/qt_core/QPointF_shell.cpp cpp/qt_core/QRect_shell.cpp cpp/qt_core/QRectF_shell.cpp \
-cpp/qt_core/QSize_shell.cpp cpp/qt_core/QSizeF_shell.cpp cpp/qt_core/QLine_shell.cpp cpp/qt_core/QLineF_shell.cpp \
-cpp/qt_core/QModelIndex_shell.cpp cpp/qt_core/QVariant_shell.cpp
-
-## Module specific d files.
-core_d_files += $(QTD_CORE:%=qt/%.d) qt/core/ArrayOps2
-
-## Classes.
-## TODO: use list that genareted by dgen.
-core_classes =  \
-    ArrayOps \
-    QChildEvent \
-    QCoreApplication \
-    QEvent \
-    QEventLoop \
-    QObject \
-    QTimerEvent \
-    QTranslator \
-    QByteArray \
-    QLocale \
-    QDataStream \
-    QMimeData \
-    QIODevice \
-    QDateTime \
-    QDate \
-    QTime \
-    QBitArray \
-    QRegExp \
-    QUrl \
-    QAbstractItemModel \
-    QAbstractFileEngine \
-    QFile \
-    QDir \
-    QFileInfo \
-    QTextStream \
-    QString \
-    QTimer \
-    QTextCodec \
-    QTextCodec_ConverterState \
-    QTextEncoder \
-    QTextDecoder \
-    QTimeLine \
-    QAbstractFactory \
-    QAbstractListModel \
-    QCryptographicHash \
-    QProcess \
-    QBuffer \
-    QMetaType \
-    QLibraryInfo \
-    QXmlStreamEntityResolver
\ No newline at end of file
--- a/build/core.txt	Wed Dec 23 16:58:17 2009 +0200
+++ b/build/core.txt	Wed Dec 23 23:17:36 2009 +0200
@@ -1,4 +1,4 @@
-configure_file(qt/QDefines.d.inc qt/QDefines.d)
+configure_file(d${D_VERSION}/qt/QDefines.d.inc qt/QDefines.d)
 
 ## Module specific cpp files.
 set (cpp_files qt_qtd/qtd_core qt_qtd/ArrayOpsPrimitive_shell
@@ -10,26 +10,36 @@
     qt_core/QModelIndex_shell qt_core/QMetaType_shell
     qt_core/QMetaObject_shell)
 ## Module specific d files.
-set (d_files    
-    qtd/ArrayOpsPrimitive   
-    qtd/Traits
+set (d_qt_files
+    QGlobal
     core/QString
     core/QMetaType
-    core/QMetaObject)
-set (d_version_files
+    core/QMetaObject
+    core/QLine
+    core/QLineF
+    core/QModelIndex
+    core/QRect
+    core/QRectF
+    core/QSize
+    core/QSizeF
+    core/QPoint
+    core/QPointF
+    core/QVariant
+    )
+
+set (d_qtd_files   
     Core
     Memory
-    Array    
+    Array 
+    Signal
+    String
+    ArrayOpsPrimitive   
+    Traits
     QtdObject
-    QGlobal
-    Signal qtd/Str
-    core/QLine core/QLineF
-    core/QModelIndex
-    core/QRect core/QRectF
-    core/QSize core/QSizeF
-    core/QPoint core/QPointF
-    core/QVariant)
-set (d_generated_files core/Qt QDefines)
+    )
+
+set (d_generated_files qt/core/Qt qt/QDefines)
+
 ## Classes.
 set (classes 
     QChildEvent
--- a/build/gui.makefile	Wed Dec 23 16:58:17 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,365 +0,0 @@
-## Qt Lib name.
-qt_gui_name = QtGui
-
-## Libraries linked to the cpp part (is active only when  CPP_SHARED == true).
-gui_link_cpp += qtdcore_cpp $(qt_core_lib_name)
-
-## Libraries linked to the d part (is active only when  CPP_SHARED == true)..
-gui_link_d += qtdcore
-
-## Module specific cpp files.
-gui_cpp_files += 
-
-## Module specific d files.
-gui_d_files += qt/gui/ArrayOps2
-
-## Classes.
-## TODO: use list that generated by dgen.
-gui_classes = \
-ArrayOps \
-QPushButton \
-QFileIconProvider \
-QPaintDevice \
-QPicture \
-QPixmap \
-QImage \
-QBitmap \
-QStyle \
-QStyleOption \
-QDesktopWidget \
-QMenu \
-QAction \
-QDropEvent \
-QInputContext \
-QWidget \
-QApplication \
-QIcon \
-QIconEngine \
-QPalette \
-QSizePolicy \
-QRegion \
-QFontMetrics \
-QCursor \
-QFont \
-QClipboard \
-QSessionManager \
-QPainterPath  \
-QPainterPath_Element \
-QPaintEvent \
-QTransform \
-QMatrix \
-QPainter \
-QDragLeaveEvent \
-QPolygon \
-QInputEvent \
-QDragEnterEvent \
-QKeyEvent \
-QHideEvent \
-QWheelEvent \
-QMoveEvent \
-QActionGroup \
-QActionEvent \
-QFocusEvent \
-QIconEngineV2 \
-QFontInfo \
-QStyleHintReturn \
-QColor \
-QDragMoveEvent \
-QStyleOptionMenuItem \
-QTabletEvent \
-QShowEvent \
-QResizeEvent \
-QBrush \
-QInputMethodEvent \
-QContextMenuEvent \
-QStyleOptionComplex \
-QMouseEvent \
-QHelpEvent \
-QTextFormat \
-QKeySequence \
-QCloseEvent \
-QGradient \
-QTextItem \
-QTextOption \
-QPolygonF \
-QPen \
-QTextCharFormat \
-QTextListFormat \
-QTextTableFormat \
-QTextLength \
-QTextFrameFormat \
-QTextTableCellFormat \
-QTextBlockFormat \
-QTextImageFormat \
-QFrame \
-QLabel \
-QAbstractButton \
-QMovie \
-QCheckBox \
-QRadioButton \
-QToolButton \
-QStyleOptionButton \
-QStyleOptionToolButton \
-QStyleOptionToolBar \
-QStyleOptionToolBox \
-QStyleOptionToolBoxV2 \
-QStyleOptionSlider \
-QStyleOptionViewItem \
-QStyleOptionHeader \
-QStyleOptionDockWidget \
-QStyleOptionTab \
-QButtonGroup \
-QLCDNumber \
-QAbstractSlider \
-QDial \
-QSlider \
-QScrollBar \
-QPaintEngine \
-QSpacerItem \
-QLayout \
-QLayoutItem \
-QPaintEngineState \
-QBoxLayout \
-QHBoxLayout \
-QVBoxLayout \
-QFormLayout \
-QGridLayout \
-QStackedLayout \
-QAbstractScrollArea \
-QAbstractItemDelegate \
-QAbstractItemView \
-QTreeView \
-QTableView \
-QListView \
-QHeaderView \
-QItemSelection \
-QItemSelectionModel \
-QItemSelectionRange \
-QDirModel \
-QSplitter \
-QSplitterHandle \
-QListWidget \
-QListWidgetItem \
-QMainWindow \
-QMenuBar \
-QToolBar \
-QMessageBox \
-QDockWidget \
-QDialog \
-QStatusBar \
-QTabWidget \
-QTabBar \
-QImageIOHandler \
-QImageReader \
-QTextFrame_iterator \
-QTextBlock_iterator \
-QPrinter \
-QTextLine \
-QTextEdit \
-QTextCursor \
-QTextFrame \
-QTextObject \
-QTextBlock \
-QTextDocument \
-QPrinterInfo \
-QTextList \
-QTextLayout \
-QTextBlockUserData \
-QTextDocumentFragment \
-QTextTable \
-QAbstractTextDocumentLayout \
-QTextBlockGroup \
-QTextObjectInterface \
-QTextInlineObject \
-QAbstractTextDocumentLayout_PaintContext \
-QTextLayout_FormatRange \
-QTextFragment \
-QTextTableCell \
-QPrintEngine \
-QStyleOptionTabWidgetFrame \
-QComboBox \
-QValidator \
-QCompleter \
-QLineEdit \
-QStyleOptionComboBox \
-QStyleOptionFrame \
-QFileDialog \
-QAbstractProxyModel \
-QGraphicsItem \
-QGraphicsItemGroup \
-QGraphicsWidget \
-QGraphicsLayout \
-QGraphicsScene \
-QGraphicsSimpleTextItem \
-QGraphicsRectItem \
-QGraphicsPolygonItem \
-QGraphicsPixmapItem \
-QGraphicsPathItem \
-QGraphicsLineItem \
-QGraphicsEllipseItem \
-QGraphicsLayoutItem \
-QAbstractGraphicsShapeItem \
-QGraphicsTextItem \
-QGraphicsProxyWidget \
-QGraphicsSceneEvent \
-QGraphicsSceneWheelEvent \
-QGraphicsSceneContextMenuEvent \
-QGraphicsSceneMouseEvent \
-QGraphicsSceneResizeEvent \
-QStyleOptionGraphicsItem \
-QGraphicsSceneMoveEvent \
-QGraphicsSceneHoverEvent \
-QGraphicsSceneDragDropEvent \
-QGraphicsSceneHelpEvent \
-QGraphicsView \
-QTableWidgetSelectionRange \
-QStandardItem \
-QUndoStack \
-QTreeWidgetItem \
-QTreeWidget \
-QTextEdit_ExtraSelection \
-QTableWidgetItem \
-QTableWidget \
-QTextOption_Tab \
-QMdiSubWindow \
-QInputMethodEvent_Attribute \
-QMdiArea \
-QUndoCommand \
-QStandardItemModel \
-QAbstractAccessibleFactory \
-QAbstractIconEngineFactoryV2 \
-QAbstractImageIOHandlerFactory \
-QAbstractInputContextFactory \
-QAbstractPageSetupDialog \
-QAbstractPictureFormat \
-QAbstractPrintDialog \
-QAbstractSpinBox \
-QAbstractStyleFactory \
-QAbstractTableModel \
-QAbstractTextCodecFactory \
-QAbstractTextDocumentLayout_Selection \
-QAccessible2Interface \
-QAccessibleBridge \
-QAccessibleEvent \
-QAccessibleInterfaceEx \
-QAccessibleInterface \
-QAccessibleObjectEx \
-QAccessibleObject \
-QAccessiblePlugin \
-QAccessible \
-QAccessibleWidgetEx \
-QAccessibleWidget \
-QCalendarWidget \
-QCDEStyle \
-QCleanlooksStyle \
-QClipboardEvent \
-QColorDialog \
-QColormap \
-QColumnView \
-QCommandLinkButton \
-QCommonStyle \
-QConicalGradient \
-QDataWidgetMapper \
-QDateEdit \
-QDateTimeEdit \
-QDesktopServices \
-QDialogButtonBox \
-QDoubleSpinBox \
-QDoubleValidator \
-QDragResponseEvent \
-QDrag \
-QErrorMessage \
-QFileOpenEvent \
-QFileSystemModel \
-QFocusFrame \
-QFontComboBox \
-QFontDatabase \
-QFontDialog \
-QFontMetricsF \
-QGraphicsGridLayout \
-QGraphicsItemAnimation \
-QGraphicsLinearLayout \
-QGroupBox \
-QHoverEvent \
-QIconDragEvent \
-QIconEnginePluginV2 \
-QImageIOPlugin \
-QImageWriter \
-QInputContextFactory \
-QInputContextPlugin \
-QInputDialog \
-QIntValidator \
-QItemDelegate \
-QItemEditorCreatorBase \
-QItemEditorFactory \
-QLinearGradient \
-QMotifStyle \
-QStyleOptionGroupBox \
-QStyleOptionSpinBox \
-QWindowsStyle \
-QStyledItemDelegate \
-QStyleFactory \
-QStyleHintReturnMask \
-QStyleHintReturnVariant \
-QStyleOptionDockWidgetV2 \
-QStyleOptionFocusRect \
-QStyleOptionFrameV2 \
-QStyleOptionProgressBar \
-QStyleOptionProgressBarV2 \
-QStyleOptionRubberBand \
-QStyleOptionSizeGrip \
-QStyleOptionTabBarBase \
-QStyleOptionTabV2 \
-QStyleOptionTitleBar \
-QStyleOptionViewItemV2 \
-QStyleOptionViewItemV3 \
-QStyleOptionViewItemV4 \
-QStylePainter \
-QStylePlugin \
-QRubberBand \
-QSpinBox \
-QSplashScreen \
-QStackedWidget \
-QStatusTipEvent \
-QStringListModel \
-QSyntaxHighlighter \
-QSystemTrayIcon \
-QTextBrowser \
-QTextCodecPlugin \
-QTimeEdit \
-QToolBarChangeEvent \
-QToolBox \
-QToolTip \
-QTreeWidgetItemIterator \
-QUndoGroup \
-QUndoView \
-QWhatsThisClickedEvent \
-QWhatsThis \
-QWidgetAction \
-QWidgetItem \
-QWindowStateChangeEvent \
-QWizardPage \
-QWizard \
-QWorkspace \
-QPageSetupDialog \
-QPainterPathStroker \
-QPictureFormatPlugin \
-QPictureIO \
-QPixmapCache \
-QPlainTextDocumentLayout \
-QPlainTextEdit \
-QPlastiqueStyle \
-QPrintDialog \
-QPrintPreviewDialog \
-QPrintPreviewWidget \
-QProgressBar \
-QProgressDialog \
-QProxyModel \
-QRadialGradient \
-QRegExpValidator \
-QScrollArea \
-QShortcutEvent \
-QShortcut \
-QSizeGrip \
-QSortFilterProxyModel \
-QSound
\ No newline at end of file
--- a/build/gui.txt	Wed Dec 23 16:58:17 2009 +0200
+++ b/build/gui.txt	Wed Dec 23 23:17:36 2009 +0200
@@ -4,7 +4,7 @@
 	)
 set (cpp_files qt_gui/UrlHandler_shell )
 set (cpp_generated_files qt_gui/UrlHandler_shell_moc)
-#set (d_files gui/UrlHandler)
+#set (d_qt_files gui/UrlHandler)
 set(classes
     QPushButton
     QFileIconProvider
--- a/build/network.makefile	Wed Dec 23 16:58:17 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-## Qt Lib name.
-qt_network_name = QtNetwork
-
-## Libraries linked to the cpp part (is active only when  CPP_SHARED == true).
-network_link_cpp += qtdcore_cpp $(qt_core_lib_name)
-
-## Libraries linked to the d part (is active only when  CPP_SHARED == true)..
-network_link_d += qtdcore
-
-## Module specific cpp files.
-network_cpp_files += 
-
-## Module specific d files.
-network_d_files += 
-
-network_d_files += qt/network/ArrayOps2 qt/network/QSsl
-
-## Classes.
-## TODO: use list that generated by dgen.
-network_classes = \
-ArrayOps \
-QAbstractNetworkCache \
-QAbstractSocket \
-QAuthenticator \
-QFtp \
-QHostAddress \
-QHostInfo \
-QHttpHeader \
-QHttpRequestHeader \
-QHttpResponseHeader \
-QHttp \
-QIPv6Address \
-QLocalServer \
-QLocalSocket \
-QNetworkAccessManager \
-QNetworkAddressEntry \
-QNetworkCacheMetaData \
-QNetworkCookieJar \
-QNetworkCookie \
-QNetworkInterface \
-QNetworkProxy \
-QNetworkProxyFactory \
-QNetworkProxyQuery \
-QNetworkReply \
-QNetworkRequest \
-QSslCertificate \
-QSslCipher \
-QSslConfiguration \
-QSslError \
-QSslKey \
-QSslSocket \
-QTcpServer \
-QTcpSocket \
-QUdpSocket \
-QUrlInfo
\ No newline at end of file
--- a/build/opengl.makefile	Wed Dec 23 16:58:17 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-##QTD_OPENGL += opengl/QGL opengl/gl opengl/glu opengl/glfuncs opengl/gltypes
-
-## Qt Lib name.
-qt_opengl_name = QtOpenGL
-
-## Libraries linked to the cpp part (is active only when  CPP_SHARED == true).
-## TODO: Add linux support.
-opengl_link_cpp += qtdcore_cpp $(qt_core_lib_name) $(qt_gui_lib_name)
-
-## Libraries linked to the d part (is active only when  CPP_SHARED == true)..
-opengl_link_d += qtdcore
-
-## Classes.
-## TODO: use list that generated by dgen.
-opengl_classes = \
-    QGLColormap \
-    QGLContext \
-    QGLFormat \
-    QGLFramebufferObject \
-    QGLPixelBuffer \
-    QGLWidget \
--- a/build/opengl.txt	Wed Dec 23 16:58:17 2009 +0200
+++ b/build/opengl.txt	Wed Dec 23 23:17:36 2009 +0200
@@ -7,7 +7,7 @@
     QGLPixelBuffer
     QGLWidget
     )
-set (d_files opengl/gl  opengl/glfuncs  opengl/gltypes  opengl/glu)
+set (d_qt_files opengl/gl  opengl/glfuncs  opengl/gltypes  opengl/glu)
 if(${CMAKE_SYSTEM_NAME} STREQUAL Windows AND D_IS_MARS)
     set(link_example opengl32 glu32)
     install(FILES lib/opengl32.lib lib/glu32.lib DESTINATION lib)
--- a/build/posix.makefile	Wed Dec 23 16:58:17 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-SYSTEM = posix
-ifndef QTDIR
-QTDIR = /usr/share/qt4
-ifndef QTDIR_INC
-QTDIR_INC = /usr/include/qt4
-endif
-ifndef QTDIR_LIB
-QTDIR_LIB = /usr/lib
-endif
-else
-ifndef QTDIR_INC
-QTDIR_INC = $(QTDIR)/include
-endif
-ifndef QTDIR_LIB
-QTDIR_LIB = $(QTDIR)/lib
-endif
-endif
-DYN_LIB_EXT = so
-D_OBJ_EXT = o
-LIB_NAME_PREFIX = lib
-GEN = ./generator
-MKDIR = mkdir -p
-RM = rm -f
-SL = /
-
--- a/build/rm.d	Wed Dec 23 16:58:17 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
- import tango.io.FilePath;
- import tango.io.Stdout;
- import tango.text.Util;
- void main (char[][] args)
- {
-     foreach(arg; args[1..$])
-     {
-	 try
-	 {
-	    auto a = replace(arg,'\\','/');
-	    auto file = new FilePath(arg);
-	    if (file.exists())
-	    {
-		file.remove();
-		Stdout.format("'{}' removed", arg).newline;
-	    }
-	 }
-	 catch
-	 {
-	     Stdout.format("Error: '{}' don`t removed", arg).newline;
-	 }
-     }
- }
Binary file build/rm.exe has changed
--- a/build/svg.makefile	Wed Dec 23 16:58:17 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-## Qt Lib name.
-qt_svg_name = QtSvg
-
-## Libraries linked to the cpp part (is active only when  CPP_SHARED == true).
-svg_link_cpp += qtdcore_cpp $(qt_core_lib_name) $(qt_gui_lib_name)
-
-## Libraries linked to the d part (is active only when  CPP_SHARED == true)..
-svg_link_d += qtdcore
-
-## Module specific cpp files.
-svg_cpp_files += 
-
-## Module specific d files.
-svg_d_files += 
-
-## Classes.
-## TODO: use list that generated by dgen.
-svg_classes = \
-    ArrayOps \
-    QGraphicsSvgItem \
-    QSvgGenerator \
-    QSvgRenderer \
-    QSvgWidget
\ No newline at end of file
--- a/build/webkit.makefile	Wed Dec 23 16:58:17 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-## Qt Lib name.
-qt_webkit_name = QtWebkit
-
-## Libraries linked to the cpp part (is active only when  CPP_SHARED == true).
-webkit_link_cpp += qtdcore_cpp $(qt_core_lib_name) $(qt_gui_lib_name) $(qt_network_lib_name)
-
-## Libraries linked to the d part (is active only when  CPP_SHARED == true)..
-webkit_link_d += qtdcore
-
-## Module specific cpp files.
-webkit_cpp_files += 
-
-## Module specific d files.
-webkit_d_files += 
-
-## Classes.
-## TODO: use list that generated by dgen.
-webkit_classes = \
-    ArrayOps \
-    QWebFrame \
-    QWebHistoryInterface \
-    QWebHistoryItem \
-    QWebHistory \
-    QWebHitTestResult \
-    QWebPage \
-    QWebSettings \
-    QWebView
\ No newline at end of file
--- a/build/windows.makefile	Wed Dec 23 16:58:17 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-SYSTEM = windows
-ifndef QTDIR
-QTDIR = C:\eldar\Qt\qt
-endif
-IMPLIB = implib /system /PAGESIZE:32
-DYN_LIB_EXT = dll
-D_OBJ_EXT = obj
-LIB_NAME_PREFIX =
-LIB_LINK = mingw32 qtmain
-BIN_EXT = .exe
-GEN = release\generator$(BIN_EXT)
-MKDIR = build\mkdir.bat
-RM = build\rm.exe
-SL = \\
-
-CC_LFLAGS += -Wl -Wl,-subsystem,windows
-
-ifndef QTDIR_INC
-QTDIR_INC = $(QTDIR)\include
-endif
-
-ifndef QTDIR_LIB
-QTDIR_LIB = $(QTDIR)\lib
-endif
-
-QT_LIB_POSTFIX = 4
\ No newline at end of file
--- a/build/xml.makefile	Wed Dec 23 16:58:17 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-## Qt Lib name.
-qt_xml_name = QtXml
-
-## Libraries linked to the cpp part (is active only when  CPP_SHARED == true).
-xml_link_cpp += qtdcore_cpp $(qt_core_lib_name)
-
-## Libraries linked to the d part (is active only when  CPP_SHARED == true)..
-xml_link_d += qtdcore
-
-## Module specific cpp files.
-xml_cpp_files += 
-
-## Module specific d files.
-xml_d_files += 
-
-## Classes.
-## TODO: use list that generated by dgen.
-xml_classes = \
-ArrayOps \
-QDomAttr \
-QDomCDATASection \
-QDomCharacterData \
-QDomComment \
-QDomDocumentFragment \
-QDomDocument \
-QDomDocumentType \
-QDomElement \
-QDomEntityReference \
-QDomEntity \
-QDomImplementation \
-QDomNamedNodeMap \
-QDomNodeList \
-QDomNode \
-QDomNotation \
-QDomProcessingInstruction \
-QDomText \
-QXmlAttributes \
-QXmlContentHandler \
-QXmlDeclHandler \
-QXmlDefaultHandler \
-QXmlDTDHandler \
-QXmlEntityResolver \
-QXmlErrorHandler \
-QXmlInputSource \
-QXmlLexicalHandler \
-QXmlLocator \
-QXmlNamespaceSupport \
-QXmlParseException \
-QXmlReader \
-QXmlSimpleReader \
-QXmlStreamAttribute \
-QXmlStreamAttributes \
-QXmlStreamEntityDeclaration \
-QXmlStreamNamespaceDeclaration \
-QXmlStreamNotationDeclaration \
-QXmlStreamReader \
-QXmlStreamWriter
\ No newline at end of file
--- a/d1/qt/QGlobal.d	Wed Dec 23 16:58:17 2009 +0200
+++ b/d1/qt/QGlobal.d	Wed Dec 23 23:17:36 2009 +0200
@@ -1,6 +1,6 @@
 module qt.QGlobal;
 
-public import qt.qtd.Str;
+public import qtd.String;
 public import qt.QDefines;
 
 version (D_Version2)
--- a/d1/qt/core/QVariant.d	Wed Dec 23 16:58:17 2009 +0200
+++ b/d1/qt/core/QVariant.d	Wed Dec 23 23:17:36 2009 +0200
@@ -1,7 +1,7 @@
 module qt.core.QVariant;
 
 public import qt.QGlobal;
-private import qt.QtdObject;
+private import qtd.QtdObject;
 private import qt.core.QMetaType;
 
 // automatic imports-------------
--- a/d1/qtd/Array.d	Wed Dec 23 16:58:17 2009 +0200
+++ b/d1/qtd/Array.d	Wed Dec 23 23:17:36 2009 +0200
@@ -9,7 +9,7 @@
  *  (See accompanying file boost-license-1.0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  *
  */
-module qt.qtd.Array;
+module qtd.Array;
 
 version (Tango)
     import tango.stdc.string;
--- a/d1/qtd/ArrayOpsPrimitive.d	Wed Dec 23 16:58:17 2009 +0200
+++ b/d1/qtd/ArrayOpsPrimitive.d	Wed Dec 23 23:17:36 2009 +0200
@@ -9,7 +9,7 @@
 *
 */
 
-module qt.qtd.ArrayOpsPrimitive;
+module qtd.ArrayOpsPrimitive;
 
 import qt.QGlobal;
 
--- a/d1/qtd/QtdObject.d	Wed Dec 23 16:58:17 2009 +0200
+++ b/d1/qtd/QtdObject.d	Wed Dec 23 23:17:36 2009 +0200
@@ -10,7 +10,7 @@
 * 
 */
 
-module qt.QtdObject;
+module qtd.QtdObject;
 
 import qt.Signal;
 import tango.core.Memory;
--- a/d1/qtd/Signal.d	Wed Dec 23 16:58:17 2009 +0200
+++ b/d1/qtd/Signal.d	Wed Dec 23 23:17:36 2009 +0200
@@ -9,7 +9,7 @@
  *  (See accompanying file boost-license-1.0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  *
  */
-module qt.Signal;
+module qtd.Signal;
 
 public import qt.QGlobal;
 import tango.core.Exception;
--- a/d1/qtd/Traits.d	Wed Dec 23 16:58:17 2009 +0200
+++ b/d1/qtd/Traits.d	Wed Dec 23 23:17:36 2009 +0200
@@ -1,10 +1,3 @@
-module qt.qtd.Traits;
+module qtd.Traits;
 
-version (D_Version2)
-{
-    public import std.traits;
-}
-else
-{
-    public import tango.core.Traits : BaseTypeTuple = BaseTypeTupleOf;
-}
+public import tango.core.Traits : BaseTypeTuple = BaseTypeTupleOf;
--- a/d2/qt/QGlobal.d	Wed Dec 23 16:58:17 2009 +0200
+++ b/d2/qt/QGlobal.d	Wed Dec 23 23:17:36 2009 +0200
@@ -1,6 +1,6 @@
 module qt.QGlobal;
 
-public import qt.qtd.Str;
+public import qtd.String;
 public import qt.QDefines;
 
 version (D_Version2)
--- a/d2/qt/core/QMetaObject.d	Wed Dec 23 16:58:17 2009 +0200
+++ b/d2/qt/core/QMetaObject.d	Wed Dec 23 23:17:36 2009 +0200
@@ -1,9 +1,9 @@
 module qt.core.QMetaObject;
 
 import
-	qt.Core,
+	qtd.Core,
 	qt.core.QObject,
-	qt.QtdObject;
+	qtd.QtdObject;
 
 /++
     Meta-object for QObject classes.
--- a/d2/qt/core/QVariant.d	Wed Dec 23 16:58:17 2009 +0200
+++ b/d2/qt/core/QVariant.d	Wed Dec 23 23:17:36 2009 +0200
@@ -1,7 +1,7 @@
 module qt.core.QVariant;
 
 public import qt.QGlobal;
-private import qt.QtdObject;
+private import qtd.QtdObject;
 private import qt.core.QMetaType;
 
 // automatic imports-------------
--- a/d2/qtd/Array.d	Wed Dec 23 16:58:17 2009 +0200
+++ b/d2/qtd/Array.d	Wed Dec 23 23:17:36 2009 +0200
@@ -9,11 +9,11 @@
  *  (See accompanying file boost-license-1.0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  *
  */
-module qt.Array;
+module qtd.Array;
 
 import
 	core.stdc.string,
-	qt.Memory;
+	qtd.Memory;
 
 void append(alias alloc = GCAlloc, T)(ref T[] array, T elem)
 {
--- a/d2/qtd/ArrayOpsPrimitive.d	Wed Dec 23 16:58:17 2009 +0200
+++ b/d2/qtd/ArrayOpsPrimitive.d	Wed Dec 23 23:17:36 2009 +0200
@@ -9,7 +9,7 @@
 *
 */
 
-module qt.qtd.ArrayOpsPrimitive;
+module qtd.ArrayOpsPrimitive;
 
 import qt.QGlobal;
 
--- a/d2/qtd/Core.d	Wed Dec 23 16:58:17 2009 +0200
+++ b/d2/qtd/Core.d	Wed Dec 23 23:17:36 2009 +0200
@@ -1,4 +1,4 @@
-module qt.Core;
+module qtd.Core;
 
 /**
 	Casts from to type $(D_PARAM U), bypassing dynamic checks.
--- a/d2/qtd/Memory.d	Wed Dec 23 16:58:17 2009 +0200
+++ b/d2/qtd/Memory.d	Wed Dec 23 23:17:36 2009 +0200
@@ -1,4 +1,4 @@
-module qt.Memory;
+module qtd.Memory;
 
 import
 	core.exception,
--- a/d2/qtd/QtdObject.d	Wed Dec 23 16:58:17 2009 +0200
+++ b/d2/qtd/QtdObject.d	Wed Dec 23 23:17:36 2009 +0200
@@ -9,14 +9,14 @@
 *
 */
 
-module qt.QtdObject;
+module qtd.QtdObject;
 
 import
 	core.memory,
-	qt.Signal,
-	qt.Core,
-	qt.Memory,
-	qt.Array;
+	qtd.Signal,
+	qtd.Core,
+	qtd.Memory,
+	qtd.Array;
 
 struct ScopeObject(T : QtdObjectBase)
 {
--- a/d2/qtd/Signal.d	Wed Dec 23 16:58:17 2009 +0200
+++ b/d2/qtd/Signal.d	Wed Dec 23 23:17:36 2009 +0200
@@ -9,11 +9,11 @@
  *  (See accompanying file boost-license-1.0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  *
  */
-module qt.Signal;
+module qtd.Signal;
 
 import
 	qt.QGlobal,
-	qt.Memory;
+	qtd.Memory;
 public import std.metastrings;
 
 import core.stdc.stdlib : crealloc = realloc, cfree = free;
--- a/generator/cppimplgenerator.cpp	Wed Dec 23 16:58:17 2009 +0200
+++ b/generator/cppimplgenerator.cpp	Wed Dec 23 23:17:36 2009 +0200
@@ -2944,7 +2944,7 @@
                                      int argument_index,
                                      Option option)
 {
-    s << "writeQtToJava" << endl;
+    s << "// writeQtToJava" << endl;
 
     // Conversion to Java: Native code for return values, shell code for arguments
     TypeSystem::Language lang = argument_index == 0 ? TypeSystem::NativeCode : TypeSystem::ShellCode;
--- a/generator/dgenerator.cpp	Wed Dec 23 16:58:17 2009 +0200
+++ b/generator/dgenerator.cpp	Wed Dec 23 23:17:36 2009 +0200
@@ -1905,13 +1905,13 @@
 
     if (!m_isRecursive) {
         s << "public import qt.QGlobal;" << endl
-          << "public import qt.core.Qt;" << endl
-          << "public import qt.QtdObject;" << endl
-          << "private import qt.core.QString;" << endl
-          << "private import qt.Array;" << endl;
+          << "public import qt.core.Qt;" << endl          
+          << "public import qtd.QtdObject;" << endl
+          << "import qt.core.QString;" << endl
+          << "import qtd.Array;" << endl;
         if (d_class->isQObject()) {
             s << "public import qt.core.QMetaObject;" << endl;
-            s << "public import qt.Signal;" << endl;
+            s << "public import qtd.Signal;" << endl;
             if (d_class->name() != "QObject")
                 s << "public import qt.core.QObject;" << endl;
         }
@@ -1940,7 +1940,7 @@
               << "import std.string;" << endl
               << "import std.utf;" << endl
               << "import core.memory;" << endl
-              << "import qt.Core;" << endl;
+              << "import qtd.Core;" << endl;
         }
         else
         {
--- a/generator/typesystem_core.xml	Wed Dec 23 16:58:17 2009 +0200
+++ b/generator/typesystem_core.xml	Wed Dec 23 23:17:36 2009 +0200
@@ -2481,7 +2481,7 @@
     </extra-includes>
 
     <extra-includes>
-        <include file-name="qt.qtd.Str" location="java"/>
+        <include file-name="qtd.String" location="java"/>
     </extra-includes>
 
     <modify-function signature="argv()" remove="all"/> <!-- Obsolete -->
--- a/generator/typesystem_gui-java.java	Wed Dec 23 16:58:17 2009 +0200
+++ b/generator/typesystem_gui-java.java	Wed Dec 23 23:17:36 2009 +0200
@@ -291,7 +291,7 @@
 }// class
 
 class QImage___ extends QImage {
-    private import qt.qtd.Str;
+    private import qtd.String;
 
     public this(string[] xpm) {
         this(toStringzArray(xpm));
@@ -477,7 +477,7 @@
 
 class QPixmap___ extends QPixmap {
 
-	private import qt.qtd.Str;
+	private import qtd.String;
 
     public this(string[] xpm) {
 		this(toStringzArray(xpm));
--- a/generator/typesystem_gui.xml	Wed Dec 23 16:58:17 2009 +0200
+++ b/generator/typesystem_gui.xml	Wed Dec 23 23:17:36 2009 +0200
@@ -7517,7 +7517,7 @@
       <include file-name="QIcon" location="global"/>
       <include file-name="QLocale" location="global"/>
 
-      <include file-name="qt.qtd.Str" location="java"/>
+      <include file-name="qtd.String" location="java"/>
     </extra-includes>
 
     <modify-function signature="QApplication(int &amp;, char  **, int)">