Rename qmlwidgets namespace to gui

CMakeLists.txt

@@ -5,6 +5,9 @@ set(QF_BUILD_QML_PLUGINS ON CACHE BOOL "Build with QML Plugins support")
 project(quickbox LANGUAGES C CXX)
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_VISIBILITY_PRESET hidden)
+set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
+
 include(CTest)
 set(CMAKE_SHARED_LIBRARY_PREFIX "") # we don't want CMake to prepend "lib" to our libraries, we prefer adding that ourselves
 

libqf/CMakeLists.txt

@@ -1,5 +1,5 @@
 add_subdirectory(libqfcore)
-add_subdirectory(libqfqmlwidgets)
+add_subdirectory(libqfgui)
 
 if(USE_QT6 AND QF_BUILD_QML_PLUGINS)
 	add_subdirectory(plugins)

libqf/libqfqmlwidgets/CMakeLists.txt → libqf/libqfgui/CMakeLists.txt

@@ -1,4 +1,4 @@
-add_library(libqfqmlwidgets SHARED
+add_library(libqfgui SHARED
     src/action.cpp
     src/actiongroup.cpp
     src/checkbox.cpp
@@ -104,42 +104,42 @@ add_library(libqfqmlwidgets SHARED
     src/texteditwidget.ui
     src/timeedit.cpp
     src/toolbar.cpp
-    style/qf_qmlwidgets_style.qrc
+    style/qf_gui_style.qrc
 
-    images/qf_qmlwidgets_images.qrc
-	images/flat/qf_qmlwidgets_images_flat.qrc
-	images/dark/qf_qmlwidgets_images_dark.qrc
-	src/reports/widgets/printtableviewwidget/reports/qf_qmlwidgets_printtablewidget_reports.qrc
+    images/qf_gui_images.qrc
+	images/flat/qf_gui_images_flat.qrc
+	images/dark/qf_gui_images_dark.qrc
+	src/reports/widgets/printtableviewwidget/reports/qf_gui_printtablewidget_reports.qrc
     )
 
 qt6_add_translation(QM_FILES
-	libqfqmlwidgets-cs_CZ.ts
-	libqfqmlwidgets-fr_FR.ts
-	libqfqmlwidgets-nb_NO.ts
-	libqfqmlwidgets-nl_BE.ts
-	libqfqmlwidgets-pl_PL.ts
-	libqfqmlwidgets-ru_RU.ts
-	libqfqmlwidgets-uk_UA.ts
+	libqfgui-cs_CZ.ts
+	libqfgui-fr_FR.ts
+	libqfgui-nb_NO.ts
+	libqfgui-nl_BE.ts
+	libqfgui-pl_PL.ts
+	libqfgui-ru_RU.ts
+	libqfgui-uk_UA.ts
 	)
 
-qt6_add_lupdate(libqfqmlwidgets TS_FILES
-	libqfqmlwidgets-cs_CZ.ts
-	libqfqmlwidgets-fr_FR.ts
-	libqfqmlwidgets-nb_NO.ts
-	libqfqmlwidgets-nl_BE.ts
-	libqfqmlwidgets-pl_PL.ts
-	libqfqmlwidgets-ru_RU.ts
-	libqfqmlwidgets-uk_UA.ts
+qt6_add_lupdate(libqfgui TS_FILES
+	libqfgui-cs_CZ.ts
+	libqfgui-fr_FR.ts
+	libqfgui-nb_NO.ts
+	libqfgui-nl_BE.ts
+	libqfgui-pl_PL.ts
+	libqfgui-ru_RU.ts
+	libqfgui-uk_UA.ts
 	)
 
-target_sources(libqfqmlwidgets PRIVATE ${QM_FILES})
+target_sources(libqfgui PRIVATE ${QM_FILES})
 
-target_link_libraries(libqfqmlwidgets PUBLIC Qt::Svg Qt::PrintSupport Qt::Sql Qt::Qml Qt::Widgets Qt::Xml libqfcore)
-target_include_directories(libqfqmlwidgets PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
-target_include_directories(libqfqmlwidgets PUBLIC include)
-target_compile_definitions(libqfqmlwidgets PRIVATE QFQMLWIDGETS_BUILD_DLL)
+target_link_libraries(libqfgui PUBLIC Qt::Svg Qt::PrintSupport Qt::Sql Qt::Qml Qt::Widgets Qt::Xml libqfcore)
+target_include_directories(libqfgui PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(libqfgui PUBLIC include)
+target_compile_definitions(libqfgui PRIVATE QFGUI_BUILD_DLL)
 
-install(TARGETS libqfqmlwidgets)
+install(TARGETS libqfgui)
 install(FILES ${QM_FILES} DESTINATION ${CMAKE_INSTALL_BINDIR}/translations)
 
 

libqf/libqfqmlwidgets/images/dark/qf_qmlwidgets_images_dark.qrc → libqf/libqfgui/images/dark/qf_gui_images_dark.qrc

@@ -1,5 +1,5 @@
 <RCC>
-	<qresource prefix="/qf/qmlwidgets/images/dark">
+	<qresource prefix="/qf/gui/images/dark">
 		<file>home.svg</file>
 		<file>new.svg</file>
 		<file>open.svg</file>

libqf/libqfqmlwidgets/images/flat/qf_qmlwidgets_images_flat.qrc → libqf/libqfgui/images/flat/qf_gui_images_flat.qrc

@@ -1,5 +1,5 @@
 <RCC>
-	<qresource prefix="/qf/qmlwidgets/images/flat">
+	<qresource prefix="/qf/gui/images/flat">
 		<file>home.svg</file>
 		<file>new.svg</file>
 		<file>open.svg</file>