From 024360dec5dd99061b6d1b30a40b461b73459e33 Mon Sep 17 00:00:00 2001
From: peri4 <peri4ko@yandex.ru>
Date: Thu, 15 Jun 2023 12:27:01 +0300
Subject: [PATCH] PIQtUtils lang fix

---
 cmake/QtWraps.cmake                                           | 4 ++++
 .../lang/{piqt_utils_en.ts => qad_piqt_utils_en.ts}           | 0
 .../lang/{piqt_utils_ru.ts => qad_piqt_utils_ru.ts}           | 0
 libs/piqt_utils/lang/update.bat                               | 4 ++--
 libs/sql/sql_query.h                                          | 2 ++
 5 files changed, 8 insertions(+), 2 deletions(-)
 rename libs/piqt_utils/lang/{piqt_utils_en.ts => qad_piqt_utils_en.ts} (100%)
 rename libs/piqt_utils/lang/{piqt_utils_ru.ts => qad_piqt_utils_ru.ts} (100%)

diff --git a/cmake/QtWraps.cmake b/cmake/QtWraps.cmake
index 0b9a9c9..89a68dc 100644
--- a/cmake/QtWraps.cmake
+++ b/cmake/QtWraps.cmake
@@ -923,6 +923,9 @@ macro(qad_install_lang _NAME)
 						string(SUBSTRING "${_libname}" 0 ${_sl} _libname)
 						string(REPLACE "::" "_" _libname "${_libname}")
 						string(TOLOWER "${_libname}" _libname )
+						if ("${_libname}" STREQUAL "qad_piqtutils")
+							set(_libname "qad_piqt_utils")
+						endif()
 						#message("imp lib \"${_libname}\"")
 						list(APPEND _qt_libs ${_libname})
 					endif()
@@ -932,6 +935,7 @@ macro(qad_install_lang _NAME)
 				list(APPEND _qt_libs "qtbase")
 				foreach (_i ${${PROJECT_NAME}_LANG})
 					foreach (_l ${_qt_libs})
+						#message("lib = \"${_l}\"")
 						unset(_qm_path CACHE)
 						find_file(_qm_path "${_l}_${_i}.qm" PATHS "${Qt${_v}_LANG_DIR}" ${_PATHS} NO_DEFAULT_PATH)
 						if (EXISTS "${_qm_path}")
diff --git a/libs/piqt_utils/lang/piqt_utils_en.ts b/libs/piqt_utils/lang/qad_piqt_utils_en.ts
similarity index 100%
rename from libs/piqt_utils/lang/piqt_utils_en.ts
rename to libs/piqt_utils/lang/qad_piqt_utils_en.ts
diff --git a/libs/piqt_utils/lang/piqt_utils_ru.ts b/libs/piqt_utils/lang/qad_piqt_utils_ru.ts
similarity index 100%
rename from libs/piqt_utils/lang/piqt_utils_ru.ts
rename to libs/piqt_utils/lang/qad_piqt_utils_ru.ts
diff --git a/libs/piqt_utils/lang/update.bat b/libs/piqt_utils/lang/update.bat
index b86886b..845dd1f 100644
--- a/libs/piqt_utils/lang/update.bat
+++ b/libs/piqt_utils/lang/update.bat
@@ -1,2 +1,2 @@
-lupdate ../ -ts piqt_utils_ru.ts
-lupdate ../ -ts piqt_utils_en.ts
+lupdate ../ -ts qad_piqt_utils_ru.ts
+lupdate ../ -ts qad_piqt_utils_en.ts
diff --git a/libs/sql/sql_query.h b/libs/sql/sql_query.h
index a8428d7..8b84cff 100644
--- a/libs/sql/sql_query.h
+++ b/libs/sql/sql_query.h
@@ -46,6 +46,8 @@ public:
 
 	QSqlQuery & query() { return q; }
 
+	bool exec() { return q.exec(); }
+
 	static Result exec(QString query_, QVariantMap params = QVariantMap(), QSqlDatabase db = QSqlDatabase());
 
 	/// INSERT INTO <table> (<values.keys>) VALUES (<values.values>)