From a574473f14ddbdb91ea58e1d0f7df326119479a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?=
 =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= <peri4ko@yandex.ru>
Date: Wed, 20 Jan 2016 08:41:52 +0000
Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@76
 a8b55f48-bf90-11e4-a774-851b48703e85

---
 CMakeLists.txt          |  8 ++++----
 kx_tools/CMakeLists.txt | 36 +++++++++++++++++++++---------------
 qad_utils/qpiconfig.cpp | 14 ++++++++++++++
 3 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 64d1262..44b416d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,10 +5,10 @@ if (${WIN32})
 	find_package(MinGW REQUIRED)
 endif (${WIN32})
 find_package(Qt REQUIRED)
-set(LIB ON)
-set(USB ON)
-set(ICU ON)
-set(CRYPT ON)
+set(LIB 1)
+set(USB 1)
+set(ICU 1)
+set(CRYPT 1)
 set(LIBPROJECT 1)
 set(PIP_LIBRARY pip)
 set(PIP_FOLDERS "." "core" "containers" "thread" "system" "io" "console" "math" "code")
diff --git a/kx_tools/CMakeLists.txt b/kx_tools/CMakeLists.txt
index 34bcd13..f0a9aa8 100644
--- a/kx_tools/CMakeLists.txt
+++ b/kx_tools/CMakeLists.txt
@@ -5,6 +5,8 @@ if (NOT LIBPROJECT)
 endif ()
 include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${PIP_INCLUDES})
 
+option(KX_PULT "Build kx_pult" 1)
+
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -Wall")
 #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
 set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS}")
@@ -19,20 +21,22 @@ endif ()
 target_link_libraries(kx_utils ${PIP_LIBRARY})
 
 if (NOT DEFINED ENV{QNX_HOST})
-	find_package(Qt4 REQUIRED)
-	include_directories(${QT_INCLUDES})
-	set(CPPS "kx_pult.cpp" "kx_pult.h" "kx_pult.ui" "main_kx_pult.cpp")
-	set(MOCS "kx_pult.h")
-	file(GLOB UIS "*.ui")
-	file(GLOB RES "*.qrc")
-	qt4_wrap_cpp(CMOCS ${MOCS} OPTIONS -nw)
-	qt4_wrap_ui(CUIS ${UIS})
-	qt4_add_resources(RESS ${RES})
-	add_executable(kx_pult ${CPPS} ${CMOCS} ${CUIS} ${RESS})
-	set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${PIP_LIBRARY} qad_graphic qad_utils qad_widgets kx_utils)
-    find_package(OpenGL REQUIRED)
-    list(APPEND LIBS ${OPENGL_LIBRARIES})
-	target_link_libraries(kx_pult ${LIBS})
+	if (${KX_PULT})
+		find_package(Qt4 REQUIRED)
+		include_directories(${QT_INCLUDES})
+		set(CPPS "kx_pult.cpp" "kx_pult.h" "kx_pult.ui" "main_kx_pult.cpp")
+		set(MOCS "kx_pult.h")
+		file(GLOB UIS "*.ui")
+		file(GLOB RES "*.qrc")
+		qt4_wrap_cpp(CMOCS ${MOCS} OPTIONS -nw)
+		qt4_wrap_ui(CUIS ${UIS})
+		qt4_add_resources(RESS ${RES})
+		add_executable(kx_pult ${CPPS} ${CMOCS} ${CUIS} ${RESS})
+		set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${PIP_LIBRARY} qad_graphic qad_utils qad_widgets kx_utils)
+		find_package(OpenGL REQUIRED)
+		list(APPEND LIBS ${OPENGL_LIBRARIES})
+		target_link_libraries(kx_pult ${LIBS})
+	endif ()
 endif ()
 
 if (DEFINED LIB)
@@ -52,5 +56,7 @@ else ()
 endif ()
 
 if (NOT DEFINED ENV{QNX_HOST})
-	install(TARGETS kx_pult DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+	if (${KX_PULT})
+		install(TARGETS kx_pult DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+	endif ()
 endif ()
diff --git a/qad_utils/qpiconfig.cpp b/qad_utils/qpiconfig.cpp
index 6e1c1bd..4bfadc1 100644
--- a/qad_utils/qpiconfig.cpp
+++ b/qad_utils/qpiconfig.cpp
@@ -565,6 +565,8 @@ void QPIConfig::writeAll() {
 	//writeEntry(&root);
 	buildFullNames(&root);
 	Branch b = allLeaves();
+	QString prefix, tprefix;
+	bool isPrefix;
 	int j = 0;
 	for (int i = 0; i < other.size(); ++i) {
 		//cout << j << endl;
@@ -575,10 +577,22 @@ void QPIConfig::writeAll() {
 				++j;
 			} else {
 				stream << other[i];
+				tprefix = getPrefixFromLine(other[i], &isPrefix);
+				if (isPrefix) {
+					prefix = tprefix;
+					if (!prefix.isEmpty())
+						prefix += delim;
+				}
 				if (i < other.size() - 1) stream << '\n';
 			}
 		} else {
 			stream << other[i];
+			tprefix = getPrefixFromLine(other[i], &isPrefix);
+			if (isPrefix) {
+				prefix = tprefix;
+				if (!prefix.isEmpty())
+					prefix += delim;
+			}
 			if (i < other.size() - 1) stream << '\n';
 		}
 	}