diff options
Diffstat (limited to 'kstars')
77 files changed, 1159 insertions, 471 deletions
diff --git a/kstars/CMakeLists.txt b/kstars/CMakeLists.txt new file mode 100644 index 00000000..e4f94177 --- /dev/null +++ b/kstars/CMakeLists.txt @@ -0,0 +1,8 @@ +##### configure checks + +include( ConfigureChecks.cmake ) + + +##### subdirectories + +add_subdirectory( kstars ) diff --git a/kstars/ConfigureChecks.cmake b/kstars/ConfigureChecks.cmake new file mode 100644 index 00000000..41184537 --- /dev/null +++ b/kstars/ConfigureChecks.cmake @@ -0,0 +1,67 @@ +########################################### +# # +# Improvements and feedback are welcome # +# # +# This file is released under GPL >= 3 # +# # +########################################### + + +##### check for libusb + +if( WITH_LIBUSB ) + + pkg_search_module( LIBUSB libusb libusb-2.0 ) + if( NOT LIBUSB_FOUND ) + tde_message_fatal( "libusb support has been requested, but was not found on your system" ) + endif( NOT LIBUSB_FOUND ) + +endif( WITH_LIBUSB ) + + +##### check for pthread + +find_package ( Threads REQUIRED ) + + +##### check for zlib + +find_package ( ZLIB REQUIRED ) + + +##### check for math lib + +check_library_exists( m sincos "" LIBM ) +if( LIBM ) + set( LIBM m ) +endif( LIBM ) + + +##### check for v4l + +if( WITH_V4L ) + check_include_file( "linux/videodev2.h" HAVE_LINUX_VIDEODEV2_H ) + + if( NOT HAVE_LINUX_VIDEODEV2_H ) + check_include_file( "linux/videodev.h" HAVE_LINUX_VIDEODEV_H ) + if( NOT HAVE_LINUX_VIDEODEV_H ) + tde_message_fatal( "video4linux support is requested, but videodev2.h or videodev.h was not found on your system" ) + endif( ) + endif( ) +endif( ) + + +##### check platform OS + +message( STATUS "Cheking platform - ${CMAKE_SYSTEM_NAME}" ) + +if( ${CMAKE_SYSTEM_NAME} MATCHES "Linux" ) + set( OS_Linux true ) + set( LIB_FLI fli_linux-static ) +elseif( ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD|FreeBSD|DragonFly|NetBSD" ) + set( OS_BSD true ) + set( LIB_FLI fli_bsd-static ) +else( ) + set( OS_UNKNOWN true ) + set( LIB_FLI fli_null-static ) +endif( ) diff --git a/kstars/kstars/CMakeLists.txt b/kstars/kstars/CMakeLists.txt new file mode 100644 index 00000000..78f6b465 --- /dev/null +++ b/kstars/kstars/CMakeLists.txt @@ -0,0 +1,145 @@ +add_subdirectory( indi ) +add_subdirectory( tools ) +add_subdirectory( data ) +add_subdirectory( icons ) + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${CMAKE_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/tools + ${CMAKE_BINARY_DIR}/kstars/kstars/tools +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + +##### kstars (executable) + +tde_add_executable( kstars AUTOMOC + + SOURCES + addcatdialogui.ui addlinkdialogui.ui + ccdpreviewui.ui contrastbrightnessgui.ui + details_data.ui details_position.ui + details_links.ui details_database.ui + details_log.ui devmanager.ui + fitsheaderdialog.ui focusdialogdlg.ui + fovdialogui.ui histdialog.ui + imagereductionui.ui imgsequencedlgui.ui + indiconf.ui indihostconf.ui + kswizardui.ui newfovui.ui + opsadvancedui.ui opscatalogui.ui + opscolorsui.ui opsguidesui.ui + opssolarsystemui.ui statform.ui + streamformui.ui telescopewizard.ui + thumbnailpickerui.ui thumbnaileditorui.ui + telescopepropui.ui + addcatdialog.cpp addlinkdialog.cpp + colorscheme.cpp conbridlg.cpp + csegment.cpp deepskyobject.cpp + detaildialog.cpp devicemanager.cpp + dms.cpp dmsbox.cpp + filesource.cpp finddialog.cpp + fitshistogram.cpp ccdpreviewwg.cpp + customcatalog.cpp fitsimage.cpp + fitsprocess.cpp fitsviewer.cpp + focusdialog.cpp fov.cpp + fovdialog.cpp geolocation.cpp + imagereductiondlg.cpp imagesequence.cpp + imageviewer.cpp indidevice.cpp + indidriver.cpp indielement.cpp + indifitsconf.cpp indigroup.cpp + indimenu.cpp indiproperty.cpp + indistd.cpp infobox.cpp + infoboxes.cpp jupitermoons.cpp + ksasteroid.cpp kscomet.cpp + ksfilereader.cpp ksmoon.cpp + ksnewstuff.cpp ksnumbers.cpp + ksplanet.cpp ksplanetbase.cpp + kspluto.cpp kspopupmenu.cpp + kssun.cpp kstars.cpp + kstarsactions.cpp kstarsdata.cpp + kstarsdatetime.cpp kstarsdcop.cpp + kstarsinit.cpp kstarssplash.cpp + ksutils.cpp kswizard.cpp + locationdialog.cpp magnitudespinbox.cpp + main.cpp mapcanvas.cpp + objectnamelist.cpp opsadvanced.cpp + opscatalog.cpp opscolors.cpp + opsguides.cpp opssolarsystem.cpp + planetcatalog.cpp simclock.cpp + skymap.cpp skymapdraw.cpp + skymapevents.cpp skyobject.cpp + skyobjectname.cpp skypoint.cpp + stardatasink.cpp starobject.cpp + starpixmap.cpp streamwg.cpp + telescopewizardprocess.cpp telescopeprop.cpp + timebox.cpp timedialog.cpp + timespinbox.cpp timestepbox.cpp + timeunitbox.cpp timezonerule.cpp + toggleaction.cpp thumbnailpicker.cpp + thumbnaileditor.cpp draglistbox.cpp + Options.kcfgc kstarsinterface.skel + simclockinterface.skel + LINK + tdecore-shared + tdeui-shared + tdeio-shared + tdeprint-shared + tdenewstuff-shared + tdeeduplot-shared + tdeeduui-shared + extdate-shared + kstarstools-static + lilxml-static + indicom-static + + DEPENDENCIES + kstarstools-static + tdeeduplot-shared + tdeeduui-shared + extdate-shared + lilxml-static + indicom-static + + DESTINATION ${BIN_INSTALL_DIR} +) + + +##### icons + +tde_install_icons( ) + + +##### other data + +install( + FILES kstarsui.rc fitsviewer.rc + DESTINATION ${DATA_INSTALL_DIR}/kstars/ +) + +install( + FILES kstars.desktop + DESTINATION ${XDG_APPS_INSTALL_DIR} +) + +install( + FILES kstars.kcfg + DESTINATION ${KCFG_INSTALL_DIR} +) + +install( + FILES kstarsrc + DESTINATION ${CONFIG_INSTALL_DIR} +) + +install( + FILES kstarsinterface.h simclockinterface.h + DESTINATION ${INCLUDE_INSTALL_DIR} +) diff --git a/kstars/kstars/addcatdialogui.ui b/kstars/kstars/addcatdialogui.ui index 8842d6d4..024b17fa 100644 --- a/kstars/kstars/addcatdialogui.ui +++ b/kstars/kstars/addcatdialogui.ui @@ -351,21 +351,13 @@ <tabstop>CatalogURL</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>tdelistbox.h</includehint> - <includehint>draglistbox.h</includehint> - <includehint>draglistbox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">kurlrequester.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">tdelistbox.h</include> + <include location="global" impldecl="in implementation">draglistbox.h</include> + <include location="global" impldecl="in implementation">knuminput.h</include> + <include location="global" impldecl="in implementation">kcolorbutton.h</include> +</includes> </UI> diff --git a/kstars/kstars/addlinkdialogui.ui b/kstars/kstars/addlinkdialogui.ui index e6310813..3e9b51c9 100644 --- a/kstars/kstars/addlinkdialogui.ui +++ b/kstars/kstars/addlinkdialogui.ui @@ -150,4 +150,8 @@ </vbox> </widget> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/kstars/kstars/ccdpreviewui.ui b/kstars/kstars/ccdpreviewui.ui index 1ea53d03..4a15a500 100644 --- a/kstars/kstars/ccdpreviewui.ui +++ b/kstars/kstars/ccdpreviewui.ui @@ -426,10 +426,9 @@ </grid> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">kcombobox.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/kstars/kstars/contrastbrightnessgui.ui b/kstars/kstars/contrastbrightnessgui.ui index 22b23b67..24db4c67 100644 --- a/kstars/kstars/contrastbrightnessgui.ui +++ b/kstars/kstars/contrastbrightnessgui.ui @@ -119,8 +119,7 @@ </connection> </connections> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">knuminput.h</include> +</includes> </UI> diff --git a/kstars/kstars/data/CMakeLists.txt b/kstars/kstars/data/CMakeLists.txt new file mode 100644 index 00000000..96f3da2b --- /dev/null +++ b/kstars/kstars/data/CMakeLists.txt @@ -0,0 +1,22 @@ +file( GLOB _pics RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.png ) +file( GLOB _dats RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.dat ) +file( GLOB _vsops RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.vsop ) +file( GLOB _orbits RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.orbit ) +file( GLOB _colors RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.colors ) + +list( REMOVE_ITEM _pics lo16-app-kstars.png lo32-app-kstars.png ) +list( REMOVE_ITEM _pics glstarbase.png ) + +install( + FILES + tips + ${_pics} + ${_dats} + ${_vsops} + ${_orbits} + ${_colors} + valaav.txt + glossary.xml + + DESTINATION ${DATA_INSTALL_DIR}/kstars +) diff --git a/kstars/kstars/details_data.ui b/kstars/kstars/details_data.ui index aa555525..aff5de21 100644 --- a/kstars/kstars/details_data.ui +++ b/kstars/kstars/details_data.ui @@ -591,9 +591,9 @@ </image> </images> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kactivelabel.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">kactivelabel.h</include> +</includes> </UI> diff --git a/kstars/kstars/details_database.ui b/kstars/kstars/details_database.ui index 4a1353c7..4df0fe63 100644 --- a/kstars/kstars/details_database.ui +++ b/kstars/kstars/details_database.ui @@ -49,7 +49,7 @@ <customwidgets> </customwidgets> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdelistview.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">tdelistview.h</include> +</includes> </UI> diff --git a/kstars/kstars/details_links.ui b/kstars/kstars/details_links.ui index 460f2068..cd5f95b5 100644 --- a/kstars/kstars/details_links.ui +++ b/kstars/kstars/details_links.ui @@ -177,12 +177,8 @@ <customwidgets> </customwidgets> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdelistbox.h</includehint> - <includehint>tdelistbox.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">tdelistbox.h</include> +</includes> </UI> diff --git a/kstars/kstars/details_position.ui b/kstars/kstars/details_position.ui index f09c720e..c3d875c3 100644 --- a/kstars/kstars/details_position.ui +++ b/kstars/kstars/details_position.ui @@ -910,18 +910,7 @@ <customwidgets> </customwidgets> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kactivelabel.h</includehint> - <includehint>kactivelabel.h</includehint> - <includehint>kactivelabel.h</includehint> - <includehint>kactivelabel.h</includehint> - <includehint>kactivelabel.h</includehint> - <includehint>kactivelabel.h</includehint> - <includehint>kactivelabel.h</includehint> - <includehint>kactivelabel.h</includehint> - <includehint>kactivelabel.h</includehint> - <includehint>kactivelabel.h</includehint> - <includehint>kactivelabel.h</includehint> - <includehint>kactivelabel.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kactivelabel.h</include> +</includes> </UI> diff --git a/kstars/kstars/devmanager.ui b/kstars/kstars/devmanager.ui index 6ff0ebb4..2370e967 100644 --- a/kstars/kstars/devmanager.ui +++ b/kstars/kstars/devmanager.ui @@ -427,15 +427,8 @@ </connection> </connections> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdelistview.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>tdelistview.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">tdelistview.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> +</includes> </UI> diff --git a/kstars/kstars/fitsheaderdialog.ui b/kstars/kstars/fitsheaderdialog.ui index 18c6e723..c376caa6 100644 --- a/kstars/kstars/fitsheaderdialog.ui +++ b/kstars/kstars/fitsheaderdialog.ui @@ -114,4 +114,7 @@ </connection> </connections> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">tdelistview.h</include> +</includes> </UI> diff --git a/kstars/kstars/fovdialogui.ui b/kstars/kstars/fovdialogui.ui index f5f78de2..4687f4c3 100644 --- a/kstars/kstars/fovdialogui.ui +++ b/kstars/kstars/fovdialogui.ui @@ -183,10 +183,8 @@ <customwidgets> </customwidgets> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdelistbox.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">tdelistbox.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> +</includes> </UI> diff --git a/kstars/kstars/histdialog.ui b/kstars/kstars/histdialog.ui index aeda0098..650bcc83 100644 --- a/kstars/kstars/histdialog.ui +++ b/kstars/kstars/histdialog.ui @@ -333,10 +333,7 @@ </connection> </connections> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/kstars/kstars/icons/CMakeLists.txt b/kstars/kstars/icons/CMakeLists.txt new file mode 100644 index 00000000..f9628618 --- /dev/null +++ b/kstars/kstars/icons/CMakeLists.txt @@ -0,0 +1 @@ +tde_install_icons( DESTINATION ${DATA_INSTALL_DIR}/kstars/icons ) diff --git a/kstars/kstars/imgsequencedlgui.ui b/kstars/kstars/imgsequencedlgui.ui index 45b4dd60..bf698ff3 100644 --- a/kstars/kstars/imgsequencedlgui.ui +++ b/kstars/kstars/imgsequencedlgui.ui @@ -484,14 +484,9 @@ <tabstop>closeB</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kprogress.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kprogress.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">knuminput.h</include> +</includes> </UI> diff --git a/kstars/kstars/indi/CMakeLists.txt b/kstars/kstars/indi/CMakeLists.txt new file mode 100644 index 00000000..34c08881 --- /dev/null +++ b/kstars/kstars/indi/CMakeLists.txt @@ -0,0 +1,391 @@ +add_subdirectory( fli ) +add_subdirectory( apogee ) +tde_conditional_add_subdirectory( WITH_V4L webcam ) + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${ZLIB_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} + ${CMAKE_BINARY_DIR}/kstars/kstars/indi/fli +) + +set( INDIDRIVER_BASE_SRC base64.c indidrivermain.c eventloop.c ) + + +##### lilxml (static ) + +tde_add_library( lilxml STATIC_PIC + + SOURCES + lilxml.c +) + + +##### indicom (static ) + +tde_add_library( indicom STATIC_PIC + + SOURCES + base64.c + indicom.c + fitsrw.c +) + + +##### indiserver (executable) + +tde_add_executable( indiserver + + SOURCES + indiserver.c + fq.c + LINK + tdecore-shared + lilxml-static + ${CMAKE_THREAD_LIBS_INIT} + + DEPENDENCIES + lilxml-static + + DESTINATION ${BIN_INSTALL_DIR} +) + + +##### lx200basic (executable) + +tde_add_executable( lx200basic + + SOURCES + ${INDIDRIVER_BASE_SRC} + lx200driver.c + lx200basic.cpp + LINK + lilxml-static + indicom-static + tdecore-shared + + DEPENDENCIES + lilxml-static + indicom-static + + DESTINATION ${BIN_INSTALL_DIR} +) + + +##### lx200generic (executable) + +tde_add_executable( lx200generic + + SOURCES + ${INDIDRIVER_BASE_SRC} + lx200driver.c + lx200autostar.cpp + lx200_16.cpp + lx200gps.cpp + lx200generic.cpp + lx200classic.cpp + LINK + tdecore-shared + lilxml-static + indicom-static + ${LIBM} + + DEPENDENCIES + lilxml-static + indicom-static + + DESTINATION ${BIN_INSTALL_DIR} +) + + +foreach( _lx200 lx200classic lx200autostar lx200_16 lx200gps ) + tde_install_symlink( lx200generic ${BIN_INSTALL_DIR}/${_lx200} ) +endforeach( ) + + +##### celestrongps (executable) + +tde_add_executable( celestrongps + + SOURCES + ${INDIDRIVER_BASE_SRC} + celestronprotocol.c + celestrongps.cpp + LINK + tdecore-shared + lilxml-static + indicom-static + ${LIBM} + + DEPENDENCIES + lilxml-static + indicom-static + + DESTINATION ${BIN_INSTALL_DIR} +) + + +##### apmount (executable) + +tde_add_executable( apmount + + SOURCES + ${INDIDRIVER_BASE_SRC} + lx200driver.c + apmount.cpp + LINK + tdecore-shared + lilxml-static + indicom-static + + DEPENDENCIES + lilxml-static + indicom-static + + DESTINATION ${BIN_INSTALL_DIR} +) + + +##### fliccd (executable) + +tde_add_executable( fliccd + + SOURCES + ${INDIDRIVER_BASE_SRC} + fli_ccd.c + + LINK + tdecore-shared + fli_common-static + ${LIB_FLI} + indicom-static + lilxml-static + ${ZLIB_LIBRARIES} + ${LIBM} + + DEPENDENCIES + fli_common-static + ${LIB_FLI} + indicom-static + lilxml-static + + DESTINATION ${BIN_INSTALL_DIR} +) + + +##### fliwheel (executable) + +tde_add_executable( fliwheel + + SOURCES + ${INDIDRIVER_BASE_SRC} + fli_wheel.c + + LINK + tdecore-shared + fli_common-static + ${LIB_FLI} + indicom-static + lilxml-static + ${LIBM} + + DEPENDENCIES + fli_common-static + ${LIB_FLI} + indicom-static + lilxml-static + + DESTINATION ${BIN_INSTALL_DIR} +) + + +##### temma (executable) + +tde_add_executable( temma + + SOURCES + ${INDIDRIVER_BASE_SRC} + temmadriver.c + LINK + tdecore-shared + indicom-static + lilxml-static + ${LIBM} + + DEPENDENCIES + indicom-static + lilxml-static + + DESTINATION ${BIN_INSTALL_DIR} +) + + +##### skycommander (executable) + +tde_add_executable( skycommander + + SOURCES + ${INDIDRIVER_BASE_SRC} + lx200driver.c + skycommander.c + LINK + tdecore-shared + indicom-static + lilxml-static + ${LIBM} + + DEPENDENCIES + indicom-static + lilxml-static + + DESTINATION ${BIN_INSTALL_DIR} +) + + +##### sbigccd (executable) + +tde_add_executable( sbigccd + + SOURCES + ${INDIDRIVER_BASE_SRC} + sbigccd.cpp + + LINK + tdecore-shared + indicom-static + lilxml-static + ${ZLIB_LIBRARIES} + + DEPENDENCIES + indicom-static + lilxml-static + + DESTINATION ${BIN_INSTALL_DIR} +) + + +##### With Video4Linux support + +if( WITH_V4L ) + + +####### apogee_ppi (executable) + +set_property( + SOURCE apogee_ppi.cpp + APPEND PROPERTY COMPILE_DEFINITIONS + TOP_DATADIR="${DATA_INSTALL_DIR}/kstars" +) + +tde_add_executable( apogee_ppi + + SOURCES + ${INDIDRIVER_BASE_SRC} + apogee_ppi.cpp + LINK + tdecore-shared + indicom-static + lilxml-static + libapogee_PPI-static + ${ZLIB_LIBRARIES} + + DEPENDENCIES + indicom-static + lilxml-static + libapogee_PPI-static + + DESTINATION ${BIN_INSTALL_DIR} +) + + +####### v4ldriver (executable) + +tde_add_executable( v4ldriver + + SOURCES + ${INDIDRIVER_BASE_SRC} + v4ldriver.cpp + indi_v4l.cpp + LINK + tdecore-shared + indicom-static + lilxml-static + libwebcam_v4l-static + ${ZLIB_LIBRARIES} + ${LIBM} + + DEPENDENCIES + indicom-static + lilxml-static + libwebcam_v4l-static + + DESTINATION ${BIN_INSTALL_DIR} +) + + +####### v4lphilips (executable) + +tde_add_executable( v4lphilips + + SOURCES + ${INDIDRIVER_BASE_SRC} + v4ldriver.cpp + v4lphilips.cpp + indi_philips.cpp + LINK + tdecore-shared + indicom-static + lilxml-static + libwebcam_v4l-static + ${ZLIB_LIBRARIES} + ${LIBM} + + DEPENDENCIES + indicom-static + lilxml-static + libwebcam_v4l-static + + DESTINATION ${BIN_INSTALL_DIR} +) + + +##### meade_lpi (executable) + +tde_add_executable( meade_lpi + + SOURCES + ${INDIDRIVER_BASE_SRC} + v4ldriver.cpp + indi_lpi.cpp + LINK + tdecore-shared + indicom-static + lilxml-static + libwebcam_v4l-static + ${ZLIB_LIBRARIES} + + DEPENDENCIES + indicom-static + lilxml-static + libwebcam_v4l-static + + DESTINATION ${BIN_INSTALL_DIR} +) + +endif() + + +##### other data + +install( + FILES drivers.xml apogee_caminfo.xml + DESTINATION ${DATA_INSTALL_DIR}/kstars +) diff --git a/kstars/kstars/indi/apogee/CMakeLists.txt b/kstars/kstars/indi/apogee/CMakeLists.txt new file mode 100644 index 00000000..5986af5f --- /dev/null +++ b/kstars/kstars/indi/apogee/CMakeLists.txt @@ -0,0 +1,92 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${LIBUSB_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### libapogee_ISA (static) + +tde_add_library( libapogee_ISA STATIC_PIC + + SOURCES + CameraIO_Linux.cpp + CameraIO_LinuxISA.cpp +) + + +##### libapogee_PCI (static) + +tde_add_library( libapogee_PCI STATIC_PIC + + SOURCES + CameraIO_Linux.cpp + CameraIO_LinuxPCI.cpp +) + + +##### libapogee_PPI (static) + +tde_add_library( libapogee_PPI STATIC_PIC + + SOURCES + CameraIO_Linux.cpp + CameraIO_LinuxPPI.cpp +) + + +##### libapogee_USB ( static ) + +if( WITH_LIBUSB ) + +tde_add_library( libapogee_USB STATIC_PIC + + SOURCES + ApnCamData.cpp + ApnCamData_CCD3011HS.cpp + ApnCamData_CCD3011LS.cpp + ApnCamData_CCD4240HS.cpp + ApnCamData_CCD4240LS.cpp + ApnCamData_CCD4710HS.cpp + ApnCamData_CCD4710LS.cpp + ApnCamData_CCD4710LS2.cpp + ApnCamData_CCD4710LS3.cpp + ApnCamData_CCD4710LS4.cpp + ApnCamData_CCD4710LS5.cpp + ApnCamData_CCD4720HS.cpp + ApnCamData_CCD4720LS.cpp + ApnCamData_CCD5520HS.cpp + ApnCamData_CCD5520LS.cpp + ApnCamData_CCD5710HS.cpp + ApnCamData_CCD5710LS.cpp + ApnCamData_CCD7700HS.cpp + ApnCamData_CCD7700LS.cpp + ApnCamData_KAF0261E.cpp + ApnCamData_KAF0401E.cpp + ApnCamData_KAF1001E.cpp + ApnCamData_KAF1301E.cpp + ApnCamData_KAF1401E.cpp + ApnCamData_KAF3200E.cpp + ApnCamData_KAF4202.cpp + ApnCamData_KAF1602E.cpp + ApnCamData_KAF16801E.cpp + ApnCamData_KAF6303E.cpp + ApnCamData_TH7899.cpp + ApnCamTable.cpp + ApnCamera.cpp + ApnCamera_USB.cpp + ApnCamera_Linux.cpp + ApogeeUsbLinux.cpp + LINK + ${LIBUSB_LIBRARIES} +) + +endif( WITH_LIBUSB ) diff --git a/kstars/kstars/indi/fli/CMakeLists.txt b/kstars/kstars/indi/fli/CMakeLists.txt new file mode 100644 index 00000000..235137a9 --- /dev/null +++ b/kstars/kstars/indi/fli/CMakeLists.txt @@ -0,0 +1,70 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### fli_common (static) + +tde_add_library( fli_common STATIC_PIC + + SOURCES + libfli.c + libfli-camera.c + libfli-camera-parport.c + libfli-camera-usb.c + libfli-filter-focuser.c + libfli-mem.c + libfli-serial.c + libfli-sys.c + libfli-usb.c + libfli-debug.c +) + + +##### $(libfli_linux) (static) + +if( OS_Linux ) + +tde_add_library( fli_linux STATIC_PIC + + SOURCES + libfli-parport.c + libfli-usb-sys-linux.c +) + +endif() + + +##### fli_bsd (static) + +if( OS_BSD ) + +tde_add_library( fli_bsd STATIC_PIC + + SOURCES + libfli-usb-sys-bsd.c +) + +endif() + + +##### fli_null (static) + +if( OS_UNKNOWN ) + +tde_add_library( fli_null STATIC_PIC + + SOURCES + libfli-usb-sys-null.c +) + +endif() diff --git a/kstars/kstars/indi/webcam/CMakeLists.txt b/kstars/kstars/indi/webcam/CMakeLists.txt new file mode 100644 index 00000000..05283d18 --- /dev/null +++ b/kstars/kstars/indi/webcam/CMakeLists.txt @@ -0,0 +1,31 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### libwebcam_linux (static) + +if( HAVE_LINUX_VIDEODEV2_H ) + set( V4L_SOURCES v4l2_base.cpp ) +elseif( HAVE_LINUX_VIDEODEV_H ) + set( V4L_SOURCES v4l1_base.cpp v4l1_pwc.cpp ) +endif( ) + +tde_add_library( libwebcam_v4l STATIC_PIC + + SOURCES + ${V4L_SOURCES} + PPort.cpp + port.cpp + ccvt_c2.c + ccvt_misc.c +) diff --git a/kstars/kstars/indiconf.ui b/kstars/kstars/indiconf.ui index 864cf35f..59f2b3f2 100644 --- a/kstars/kstars/indiconf.ui +++ b/kstars/kstars/indiconf.ui @@ -406,11 +406,8 @@ <tabstop>buttonCancel</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> +</includes> </UI> diff --git a/kstars/kstars/kswizardui.ui b/kstars/kstars/kswizardui.ui index 3d81e6e3..ed04e2d0 100644 --- a/kstars/kstars/kswizardui.ui +++ b/kstars/kstars/kswizardui.ui @@ -844,8 +844,8 @@ button to proceed. </p> </image> </images> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">tdelistbox.h</include> +</includes> </UI> diff --git a/kstars/kstars/newfovui.ui b/kstars/kstars/newfovui.ui index 73cc811b..041282a1 100644 --- a/kstars/kstars/newfovui.ui +++ b/kstars/kstars/newfovui.ui @@ -922,27 +922,11 @@ Circle, Square, Crosshairs, Bullseye.</string> <tabstop>ColorButton</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcombobox.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">knuminput.h</include> + <include location="global" impldecl="in implementation">kcolorbutton.h</include> + <include location="global" impldecl="in implementation">kcombobox.h</include> +</includes> </UI> diff --git a/kstars/kstars/opscatalogui.ui b/kstars/kstars/opscatalogui.ui index 1aa33488..d37a259c 100644 --- a/kstars/kstars/opscatalogui.ui +++ b/kstars/kstars/opscatalogui.ui @@ -594,14 +594,8 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj </image> </images> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>magnitudespinbox.h</includehint> - <includehint>magnitudespinbox.h</includehint> - <includehint>magnitudespinbox.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>magnitudespinbox.h</includehint> - <includehint>magnitudespinbox.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">magnitudespinbox.h</include> +</includes> </UI> diff --git a/kstars/kstars/opscolorsui.ui b/kstars/kstars/opscolorsui.ui index aff25ac1..93d1e8b2 100644 --- a/kstars/kstars/opscolorsui.ui +++ b/kstars/kstars/opscolorsui.ui @@ -286,4 +286,9 @@ <tabstop>RemovePreset</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">kcombobox.h</include> + <include location="global" impldecl="in implementation">knuminput.h</include> +</includes> </UI> diff --git a/kstars/kstars/opssolarsystemui.ui b/kstars/kstars/opssolarsystemui.ui index 3373e409..0b0bc137 100644 --- a/kstars/kstars/opssolarsystemui.ui +++ b/kstars/kstars/opssolarsystemui.ui @@ -570,9 +570,9 @@ <tabstop>ClearAllTrails</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>knuminput.h</includehint> - <includehint>magnitudespinbox.h</includehint> - <includehint>magnitudespinbox.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">knuminput.h</include> + <include location="global" impldecl="in implementation">magnitudespinbox.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> +</includes> </UI> diff --git a/kstars/kstars/statform.ui b/kstars/kstars/statform.ui index 6af173cc..4da322d1 100644 --- a/kstars/kstars/statform.ui +++ b/kstars/kstars/statform.ui @@ -177,4 +177,7 @@ <tabstop>stddevOUT</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/kstars/kstars/streamformui.ui b/kstars/kstars/streamformui.ui index a4e34507..a633c9d7 100644 --- a/kstars/kstars/streamformui.ui +++ b/kstars/kstars/streamformui.ui @@ -120,9 +120,8 @@ </vbox> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kcombobox.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">kcombobox.h</include> +</includes> </UI> diff --git a/kstars/kstars/telescopepropui.ui b/kstars/kstars/telescopepropui.ui index bf823651..9c2dbc48 100644 --- a/kstars/kstars/telescopepropui.ui +++ b/kstars/kstars/telescopepropui.ui @@ -252,17 +252,10 @@ </grid> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>tdelistbox.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">tdelistbox.h</include> + <include location="global" impldecl="in implementation">kcombobox.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/kstars/kstars/telescopewizard.ui b/kstars/kstars/telescopewizard.ui index 715219c4..9755045b 100644 --- a/kstars/kstars/telescopewizard.ui +++ b/kstars/kstars/telescopewizard.ui @@ -618,7 +618,7 @@ Enter the port number your telescope is connected to. If you only have one seria <customwidgets> </customwidgets> <layoutdefaults spacing="6" margin="0"/> -<includehints> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/kstars/kstars/thumbnailpickerui.ui b/kstars/kstars/thumbnailpickerui.ui index d7a16f57..817dc09d 100644 --- a/kstars/kstars/thumbnailpickerui.ui +++ b/kstars/kstars/thumbnailpickerui.ui @@ -303,13 +303,11 @@ <customwidgets> </customwidgets> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kprogress.h</includehint> - <includehint>tdelistbox.h</includehint> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">kprogress.h</include> + <include location="global" impldecl="in implementation">tdelistbox.h</include> + <include location="global" impldecl="in implementation">kurlrequester.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/kstars/kstars/tools/CMakeLists.txt b/kstars/kstars/tools/CMakeLists.txt new file mode 100644 index 00000000..a326d42c --- /dev/null +++ b/kstars/kstars/tools/CMakeLists.txt @@ -0,0 +1,61 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${CMAKE_CURRENT_SOURCE_DIR}/.. + ${CMAKE_SOURCE_DIR} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +###### kstarstools (static) + +tde_add_library( kstarstools STATIC AUTOMOC + + SOURCES + altvstimeui.ui wutdialogui.ui + modcalcapcoorddlg.ui modcalcazeldlg.ui + modcalcdaylengthdlg.ui modcalcgalcoorddlg.ui + modcalcgeoddlg.ui modcalcjddlg.ui + modcalcprecdlg.ui modcalcsidtimedlg.ui + scriptbuilderui.ui scriptnamedialog.ui + optionstreeview.ui argchangeviewoption.ui + arglooktoward.ui argsetaltaz.ui + argsetgeolocation.ui argsetlocaltime.ui + argsetradec.ui argsettrack.ui + argtimescale.ui argwaitforkey.ui + argwaitfor.ui argzoom.ui + argexportimage.ui argprintimage.ui + argsetcolor.ui argloadcolorscheme.ui + planetviewerui.ui modcalcequinoxdlg.ui + modcalcplanetsdlg.ui modcalceclipticcoordsdlg.ui + modcalcangdistdlg.ui argsetfilternumindi.ui + observinglistui.ui argstartindi.ui + argshutdownindi.ui argswitchindi.ui + argsetportindi.ui argsettargetcoordindi.ui + argsettargetnameindi.ui argsetactionindi.ui + argsetfocusspeedindi.ui argstartfocusindi.ui + argsetfocustimeoutindi.ui argsetgeolocationindi.ui + argstartexposureindi.ui argsetutcindi.ui + argsetframetypeindi.ui argsetscopeactionindi.ui + argsetccdtempindi.ui modcalcvlsrdlg.ui + obslistwizardui.ui + altvstime.cpp wutdialog.cpp + astrocalc.cpp lcgenerator.cpp + modcalcapcoord.cpp modcalcazel.cpp + modcalcdaylength.cpp modcalcgalcoord.cpp + modcalcgeodcoord.cpp modcalcjd.cpp + modcalcprec.cpp modcalcsidtime.cpp + scriptbuilder.cpp scriptfunction.cpp + planetviewer.cpp jmoontool.cpp + kstarsplotwidget.cpp modcalcequinox.cpp + modcalcplanets.cpp modcalceclipticcoords.cpp + modcalcangdist.cpp observinglist.cpp + modcalcvlsr.cpp obslistwizard.cpp +) diff --git a/kstars/kstars/tools/altvstimeui.ui b/kstars/kstars/tools/altvstimeui.ui index 92f5030c..699471d3 100644 --- a/kstars/kstars/tools/altvstimeui.ui +++ b/kstars/kstars/tools/altvstimeui.ui @@ -527,7 +527,8 @@ <tabstop>updateButton</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>dmsbox.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">tdelistbox.h</include> +</includes> </UI> diff --git a/kstars/kstars/tools/argchangeviewoption.ui b/kstars/kstars/tools/argchangeviewoption.ui index 77629c58..7c65e990 100644 --- a/kstars/kstars/tools/argchangeviewoption.ui +++ b/kstars/kstars/tools/argchangeviewoption.ui @@ -134,8 +134,9 @@ <customwidgets> </customwidgets> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kpushbutton.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kcombobox.h</include> +</includes> </UI> diff --git a/kstars/kstars/tools/argexportimage.ui b/kstars/kstars/tools/argexportimage.ui index a60f65cf..25cd42ab 100644 --- a/kstars/kstars/tools/argexportimage.ui +++ b/kstars/kstars/tools/argexportimage.ui @@ -256,7 +256,8 @@ </image> </images> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>knuminput.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">knuminput.h</include> + <include location="global" impldecl="in implementation">kurlrequester.h</include> +</includes> </UI> diff --git a/kstars/kstars/tools/argloadcolorscheme.ui b/kstars/kstars/tools/argloadcolorscheme.ui index 45c9ecd7..a22fe8dd 100644 --- a/kstars/kstars/tools/argloadcolorscheme.ui +++ b/kstars/kstars/tools/argloadcolorscheme.ui @@ -24,4 +24,7 @@ </vbox> </widget> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">tdelistbox.h</include> +</includes> </UI> diff --git a/kstars/kstars/tools/arglooktoward.ui b/kstars/kstars/tools/arglooktoward.ui index a4e3f206..05de7494 100644 --- a/kstars/kstars/tools/arglooktoward.ui +++ b/kstars/kstars/tools/arglooktoward.ui @@ -156,7 +156,7 @@ <customwidgets> </customwidgets> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> +</includes> </UI> diff --git a/kstars/kstars/tools/argsetactionindi.ui b/kstars/kstars/tools/argsetactionindi.ui index f1268bba..5e002cb5 100644 --- a/kstars/kstars/tools/argsetactionindi.ui +++ b/kstars/kstars/tools/argsetactionindi.ui @@ -114,8 +114,7 @@ <customwidgets> </customwidgets> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/kstars/kstars/tools/argsetccdtempindi.ui b/kstars/kstars/tools/argsetccdtempindi.ui index dc4cd195..81a86ddc 100644 --- a/kstars/kstars/tools/argsetccdtempindi.ui +++ b/kstars/kstars/tools/argsetccdtempindi.ui @@ -115,9 +115,8 @@ </vbox> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">knuminput.h</include> +</includes> </UI> diff --git a/kstars/kstars/tools/argsetcolor.ui b/kstars/kstars/tools/argsetcolor.ui index 014f7145..b1891a4a 100644 --- a/kstars/kstars/tools/argsetcolor.ui +++ b/kstars/kstars/tools/argsetcolor.ui @@ -219,7 +219,8 @@ </image> </images> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcolorbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcolorbutton.h</include> + <include location="global" impldecl="in implementation">kcombobox.h</include> +</includes> </UI> diff --git a/kstars/kstars/tools/argsetfilternumindi.ui b/kstars/kstars/tools/argsetfilternumindi.ui index 83d79f09..89f1fcd0 100644 --- a/kstars/kstars/tools/argsetfilternumindi.ui +++ b/kstars/kstars/tools/argsetfilternumindi.ui @@ -118,9 +118,8 @@ </vbox> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">knuminput.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/kstars/kstars/tools/argsetfocusspeedindi.ui b/kstars/kstars/tools/argsetfocusspeedindi.ui index 012ca14f..1ae8c282 100644 --- a/kstars/kstars/tools/argsetfocusspeedindi.ui +++ b/kstars/kstars/tools/argsetfocusspeedindi.ui @@ -85,9 +85,8 @@ </grid> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">knuminput.h</include> +</includes> </UI> diff --git a/kstars/kstars/tools/argsetfocustimeoutindi.ui b/kstars/kstars/tools/argsetfocustimeoutindi.ui index a736d577..780b4c59 100644 --- a/kstars/kstars/tools/argsetfocustimeoutindi.ui +++ b/kstars/kstars/tools/argsetfocustimeoutindi.ui @@ -115,9 +115,8 @@ </vbox> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">knuminput.h</include> +</includes> </UI> diff --git a/kstars/kstars/tools/argsetframetypeindi.ui b/kstars/kstars/tools/argsetframetypeindi.ui index 0a82d908..3686a4e0 100644 --- a/kstars/kstars/tools/argsetframetypeindi.ui +++ b/kstars/kstars/tools/argsetframetypeindi.ui @@ -109,7 +109,7 @@ </vbox> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/kstars/kstars/tools/argsetgeolocation.ui b/kstars/kstars/tools/argsetgeolocation.ui index ee80245d..2f8088b6 100644 --- a/kstars/kstars/tools/argsetgeolocation.ui +++ b/kstars/kstars/tools/argsetgeolocation.ui @@ -192,10 +192,8 @@ <slot>slotFindCity()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/kstars/kstars/tools/argsetportindi.ui b/kstars/kstars/tools/argsetportindi.ui index 43b9e538..50615f76 100644 --- a/kstars/kstars/tools/argsetportindi.ui +++ b/kstars/kstars/tools/argsetportindi.ui @@ -72,8 +72,7 @@ </vbox> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/kstars/kstars/tools/argsetscopeactionindi.ui b/kstars/kstars/tools/argsetscopeactionindi.ui index 3c69cb6c..8f5cb5ba 100644 --- a/kstars/kstars/tools/argsetscopeactionindi.ui +++ b/kstars/kstars/tools/argsetscopeactionindi.ui @@ -109,7 +109,7 @@ </vbox> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/kstars/kstars/tools/argsettargetnameindi.ui b/kstars/kstars/tools/argsettargetnameindi.ui index 844df2f6..b9c2765f 100644 --- a/kstars/kstars/tools/argsettargetnameindi.ui +++ b/kstars/kstars/tools/argsettargetnameindi.ui @@ -140,9 +140,8 @@ <customwidgets> </customwidgets> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> +</includes> </UI> diff --git a/kstars/kstars/tools/argsetutcindi.ui b/kstars/kstars/tools/argsetutcindi.ui index 09fa447b..3600bc8a 100644 --- a/kstars/kstars/tools/argsetutcindi.ui +++ b/kstars/kstars/tools/argsetutcindi.ui @@ -111,8 +111,7 @@ <customwidgets> </customwidgets> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/kstars/kstars/tools/argshutdownindi.ui b/kstars/kstars/tools/argshutdownindi.ui index 126b5777..820b99ef 100644 --- a/kstars/kstars/tools/argshutdownindi.ui +++ b/kstars/kstars/tools/argshutdownindi.ui @@ -69,7 +69,7 @@ </vbox> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/kstars/kstars/tools/argstartexposureindi.ui b/kstars/kstars/tools/argstartexposureindi.ui index efc59043..5ee85e29 100644 --- a/kstars/kstars/tools/argstartexposureindi.ui +++ b/kstars/kstars/tools/argstartexposureindi.ui @@ -117,9 +117,8 @@ <customwidgets> </customwidgets> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">knuminput.h</include> +</includes> </UI> diff --git a/kstars/kstars/tools/argstartfocusindi.ui b/kstars/kstars/tools/argstartfocusindi.ui index 2c52cab0..3e08ef4b 100644 --- a/kstars/kstars/tools/argstartfocusindi.ui +++ b/kstars/kstars/tools/argstartfocusindi.ui @@ -111,7 +111,7 @@ <customwidgets> </customwidgets> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/kstars/kstars/tools/argstartindi.ui b/kstars/kstars/tools/argstartindi.ui index 166fd7d4..305cabf1 100644 --- a/kstars/kstars/tools/argstartindi.ui +++ b/kstars/kstars/tools/argstartindi.ui @@ -118,7 +118,7 @@ </vbox> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/kstars/kstars/tools/argswitchindi.ui b/kstars/kstars/tools/argswitchindi.ui index efba3fa9..8e672dd5 100644 --- a/kstars/kstars/tools/argswitchindi.ui +++ b/kstars/kstars/tools/argswitchindi.ui @@ -123,7 +123,7 @@ <customwidgets> </customwidgets> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/kstars/kstars/tools/argwaitforkey.ui b/kstars/kstars/tools/argwaitforkey.ui index 0fa2e564..7061dfd5 100644 --- a/kstars/kstars/tools/argwaitforkey.ui +++ b/kstars/kstars/tools/argwaitforkey.ui @@ -86,7 +86,7 @@ Only simple keys can currently be used; you cannot use modifier keys such as Ctr <customwidgets> </customwidgets> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/kstars/kstars/tools/argzoom.ui b/kstars/kstars/tools/argzoom.ui index 9eff8db5..c71319de 100644 --- a/kstars/kstars/tools/argzoom.ui +++ b/kstars/kstars/tools/argzoom.ui @@ -87,7 +87,7 @@ The Zoom level specifies the number of pixels which span one radian of arc. Rea <customwidgets> </customwidgets> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/kstars/kstars/tools/modcalcangdistdlg.ui b/kstars/kstars/tools/modcalcangdistdlg.ui index 3f4659a5..33bfc084 100644 --- a/kstars/kstars/tools/modcalcangdistdlg.ui +++ b/kstars/kstars/tools/modcalcangdistdlg.ui @@ -668,15 +668,7 @@ <slot>slotRunBatch()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> +</includes> </UI> diff --git a/kstars/kstars/tools/modcalcapcoorddlg.ui b/kstars/kstars/tools/modcalcapcoorddlg.ui index 5a59fa1d..ac79690f 100644 --- a/kstars/kstars/tools/modcalcapcoorddlg.ui +++ b/kstars/kstars/tools/modcalcapcoorddlg.ui @@ -856,16 +856,8 @@ <slot>slotOutputFile()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> - -</includehints> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/kstars/kstars/tools/modcalcazeldlg.ui b/kstars/kstars/tools/modcalcazeldlg.ui index ad8e076a..eff053a8 100644 --- a/kstars/kstars/tools/modcalcazeldlg.ui +++ b/kstars/kstars/tools/modcalcazeldlg.ui @@ -1059,21 +1059,8 @@ <slot>newSlot()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> - -</includehints> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/kstars/kstars/tools/modcalcdaylengthdlg.ui b/kstars/kstars/tools/modcalcdaylengthdlg.ui index 82aa6c12..2f58bbd4 100644 --- a/kstars/kstars/tools/modcalcdaylengthdlg.ui +++ b/kstars/kstars/tools/modcalcdaylengthdlg.ui @@ -640,16 +640,7 @@ <slot>slotClearCoords()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> - - <includehint>timebox.h</includehint> - <includehint>timebox.h</includehint> - <includehint>timebox.h</includehint> - <includehint>timebox.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> +</includes> </UI> diff --git a/kstars/kstars/tools/modcalceclipticcoordsdlg.ui b/kstars/kstars/tools/modcalceclipticcoordsdlg.ui index 98830fb3..1615a7c0 100644 --- a/kstars/kstars/tools/modcalceclipticcoordsdlg.ui +++ b/kstars/kstars/tools/modcalceclipticcoordsdlg.ui @@ -904,16 +904,8 @@ <slot>slotRunBatch()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/kstars/kstars/tools/modcalcequinoxdlg.ui b/kstars/kstars/tools/modcalcequinoxdlg.ui index b62875ee..4924f7bd 100644 --- a/kstars/kstars/tools/modcalcequinoxdlg.ui +++ b/kstars/kstars/tools/modcalcequinoxdlg.ui @@ -566,9 +566,8 @@ <slot>slotRunBatch()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/kstars/kstars/tools/modcalcgalcoorddlg.ui b/kstars/kstars/tools/modcalcgalcoorddlg.ui index 3b296fe0..3486d18a 100644 --- a/kstars/kstars/tools/modcalcgalcoorddlg.ui +++ b/kstars/kstars/tools/modcalcgalcoorddlg.ui @@ -915,16 +915,8 @@ <slot>slotRunBatch()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/kstars/kstars/tools/modcalcgeoddlg.ui b/kstars/kstars/tools/modcalcgeoddlg.ui index 03b9aeff..c4b294fe 100644 --- a/kstars/kstars/tools/modcalcgeoddlg.ui +++ b/kstars/kstars/tools/modcalcgeoddlg.ui @@ -801,19 +801,9 @@ <slot>slotZCheckedBatch()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcombobox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kcombobox.h</include> +</includes> </UI> diff --git a/kstars/kstars/tools/modcalcjddlg.ui b/kstars/kstars/tools/modcalcjddlg.ui index b5c1c5b8..9db090eb 100644 --- a/kstars/kstars/tools/modcalcjddlg.ui +++ b/kstars/kstars/tools/modcalcjddlg.ui @@ -500,11 +500,8 @@ <slot>showCurrentTime()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/kstars/kstars/tools/modcalcplanetsdlg.ui b/kstars/kstars/tools/modcalcplanetsdlg.ui index 638a1fbd..9b9f6099 100644 --- a/kstars/kstars/tools/modcalcplanetsdlg.ui +++ b/kstars/kstars/tools/modcalcplanetsdlg.ui @@ -1371,22 +1371,8 @@ <slot>slotPlanetsCheckedBatch()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> - - <includehint>dmsbox.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/kstars/kstars/tools/modcalcprecdlg.ui b/kstars/kstars/tools/modcalcprecdlg.ui index d0f7af15..0c749118 100644 --- a/kstars/kstars/tools/modcalcprecdlg.ui +++ b/kstars/kstars/tools/modcalcprecdlg.ui @@ -743,16 +743,8 @@ <slot>slotRunBatch()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/kstars/kstars/tools/modcalcsidtimedlg.ui b/kstars/kstars/tools/modcalcsidtimedlg.ui index e7203887..7469390a 100644 --- a/kstars/kstars/tools/modcalcsidtimedlg.ui +++ b/kstars/kstars/tools/modcalcsidtimedlg.ui @@ -861,10 +861,7 @@ <slot>slotOutputFile()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>dmsbox.h</includehint> - - <includehint>dmsbox.h</includehint> - -</includehints> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> +</includes> </UI> diff --git a/kstars/kstars/tools/modcalcvlsrdlg.ui b/kstars/kstars/tools/modcalcvlsrdlg.ui index 0c177d99..d223ca0a 100644 --- a/kstars/kstars/tools/modcalcvlsrdlg.ui +++ b/kstars/kstars/tools/modcalcvlsrdlg.ui @@ -1188,25 +1188,9 @@ <slot>slotRunBatch()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - - <includehint>klineedit.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>ktextbrowser.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">ktextbrowser.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> +</includes> </UI> diff --git a/kstars/kstars/tools/observinglistui.ui b/kstars/kstars/tools/observinglistui.ui index c53fe812..583a6ea6 100644 --- a/kstars/kstars/tools/observinglistui.ui +++ b/kstars/kstars/tools/observinglistui.ui @@ -555,19 +555,10 @@ <customwidgets> </customwidgets> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>tdelistview.h</includehint> - <includehint>tdelistbox.h</includehint> - <includehint>ktextedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">tdelistview.h</include> + <include location="global" impldecl="in implementation">tdelistbox.h</include> + <include location="global" impldecl="in implementation">ktextedit.h</include> +</includes> </UI> diff --git a/kstars/kstars/tools/obslistwizardui.ui b/kstars/kstars/tools/obslistwizardui.ui index 1f258a7b..7c6b2938 100644 --- a/kstars/kstars/tools/obslistwizardui.ui +++ b/kstars/kstars/tools/obslistwizardui.ui @@ -1013,13 +1013,11 @@ select from a region on the sky.</string> </image> </images> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdelistview.h</includehint> - <includehint>tdelistbox.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>tdelistbox.h</includehint> - <includehint>dmsbox.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>magnitudespinbox.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">tdelistview.h</include> + <include location="global" impldecl="in implementation">knuminput.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">tdelistbox.h</include> + <include location="global" impldecl="in implementation">magnitudespinbox.h</include> +</includes> </UI> diff --git a/kstars/kstars/tools/optionstreeview.ui b/kstars/kstars/tools/optionstreeview.ui index 1f9394d4..4a47be91 100644 --- a/kstars/kstars/tools/optionstreeview.ui +++ b/kstars/kstars/tools/optionstreeview.ui @@ -131,7 +131,7 @@ </connection> </connections> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdelistview.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">tdelistview.h</include> +</includes> </UI> diff --git a/kstars/kstars/tools/scriptbuilderui.ui b/kstars/kstars/tools/scriptbuilderui.ui index 0c917ea0..12470945 100644 --- a/kstars/kstars/tools/scriptbuilderui.ui +++ b/kstars/kstars/tools/scriptbuilderui.ui @@ -628,19 +628,10 @@ <slot>slotRunScript()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="4"/> -<includehints> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>tdelistbox.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>tdelistview.h</includehint> - <includehint>ktextedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">tdelistbox.h</include> + <include location="global" impldecl="in implementation">tdelistview.h</include> + <include location="global" impldecl="in implementation">ktextedit.h</include> +</includes> </UI> diff --git a/kstars/kstars/tools/scriptnamedialog.ui b/kstars/kstars/tools/scriptnamedialog.ui index 108a8b95..9e9941ac 100644 --- a/kstars/kstars/tools/scriptnamedialog.ui +++ b/kstars/kstars/tools/scriptnamedialog.ui @@ -150,8 +150,7 @@ </connection> </connections> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/kstars/kstars/tools/wutdialogui.ui b/kstars/kstars/tools/wutdialogui.ui index b3086f64..bdd1d971 100644 --- a/kstars/kstars/tools/wutdialogui.ui +++ b/kstars/kstars/tools/wutdialogui.ui @@ -553,13 +553,9 @@ <customwidgets> </customwidgets> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>tdelistbox.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>tdelistbox.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">tdelistbox.h</include> + <include location="global" impldecl="in implementation">kcombobox.h</include> +</includes> </UI> |