missing include

PIP_NO_SOCET

CMakeLists.txt

@@ -6,7 +6,7 @@ endif()
 project(PIP)
 set(PIP_MAJOR    5)
 set(PIP_MINOR    5)
-set(PIP_REVISION 4)
+set(PIP_REVISION 2)
 set(PIP_SUFFIX   )
 set(PIP_COMPANY  SHS)
 set(PIP_DOMAIN   org.SHS)
@@ -221,11 +221,18 @@ if (TESTS)
 	add_subdirectory(tests)
 endif()
 
-if(PIP_FREERTOS)
-	add_definitions(-DPIP_FREERTOS)
+if(PIP_MICRO)
+	add_definitions(-DMICRO_PIP)
 	set(ICU OFF)
 	set(LOCAL ON)
 endif()
+if(PIP_FREERTOS)
+	add_definitions(-DPIP_FREERTOS)
+endif()
+if(DEFINED PICO_BOARD)
+	add_definitions(-DPICO_SDK)
+	message(STATUS "Building PIP for Pi Pico SDK ${PICO_SDK_VERSION_STRING}")
+endif()
 
 # Check Bessel functions
 set(CMAKE_REQUIRED_INCLUDES math.h)
@@ -329,7 +336,7 @@ if ((NOT DEFINED SHSTKPROJECT) AND (DEFINED ANDROID_PLATFORM))
 	#message("${ANDROID_NDK}/sysroot/usr/include")
 endif()
 
-if(NOT PIP_FREERTOS)
+if(NOT PIP_MICRO)
 	if(WIN32)
 		if(${C_COMPILER} STREQUAL "cl.exe")
 		else()
@@ -350,7 +357,7 @@ if(NOT PIP_FREERTOS)
 	endif()
 endif()
 set(PIP_LIBS)
-if(PIP_FREERTOS)
+if(PIP_MICRO)
 	set(PIP_LIBS ${LIBS_MAIN})
 else()
 	foreach(LIB_ ${LIBS_MAIN})
@@ -364,11 +371,11 @@ if(WIN32)
 	endif()
 else()
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
-	if(DEFINED ENV{QNX_HOST} OR PIP_FREERTOS)
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftemplate-depth-32")
-	endif()
 endif()
 set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS}")
+if(DEFINED ENV{QNX_HOST} OR PIP_MICRO)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftemplate-depth-32")
+endif()
 
 set(PCRE2_BUILD_PCRE2_8   OFF)
 set(PCRE2_BUILD_PCRE2_16  ON )
@@ -406,7 +413,7 @@ endif()
 
 
 if (NOT CROSSTOOLS)
-	if (NOT PIP_FREERTOS)
+	if (NOT PIP_MICRO)
 
 		if (PIP_BUILD_CONSOLE)
 			pip_module(console "" "PIP console support" "" "" "")
@@ -624,7 +631,7 @@ string(REPLACE ";" "," PIP_EXPORTS_STR "${PIP_EXPORTS}")
 target_compile_definitions(pip PRIVATE "PICODE_DEFINES=\"${PIP_EXPORTS_STR}\"")
 
 
-if(NOT PIP_FREERTOS)
+if(NOT PIP_MICRO)
 
 # Auxiliary
 	if (NOT CROSSTOOLS)
@@ -701,7 +708,7 @@ if(NOT LOCAL)
 		install(TARGETS ${PIP_MODULES} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
 	endif()
 else()
-	if(NOT PIP_FREERTOS)
+	if(NOT PIP_MICRO)
 		if(WIN32)
 			install(TARGETS ${PIP_MODULES} RUNTIME DESTINATION bin)
 			install(TARGETS ${PIP_MODULES} ARCHIVE DESTINATION lib)
@@ -729,7 +736,7 @@ endif()
 #
 # Build Documentation
 #
-if ((NOT PIP_FREERTOS) AND (NOT CROSSTOOLS))
+if ((NOT PIP_MICRO) AND (NOT CROSSTOOLS))
 	include(PIPDocumentation)
 	find_package(Doxygen)
 	if(DOXYGEN_FOUND)
@@ -798,7 +805,7 @@ message(" Type   : ${CMAKE_BUILD_TYPE}")
 if (NOT LOCAL)
 	message(" Install: \"${CMAKE_INSTALL_PREFIX}\"")
 else()
-	if(NOT PIP_FREERTOS)
+	if(NOT PIP_MICRO)
 		message(" Install: local \"bin\", \"lib\" and \"include\"")
 	endif()
 endif()
@@ -831,7 +838,7 @@ message(" Utilites:")
 foreach(_util ${PIP_UTILS_LIST})
 	message("  * ${_util}")
 endforeach()
-if(NOT PIP_FREERTOS)
+if(NOT PIP_MICRO)
 	message("")
 	message(" Using libraries:")
 	foreach(LIB_ ${LIBS_STATUS})

cmake/FindPIP.cmake

@@ -71,7 +71,7 @@ if (NOT BUILDING_PIP)
 			find_library(PTHREAD_LIBRARY pthread)
 			find_library(UTIL_LIBRARY util)
 			set(_PIP_ADD_LIBS_ ${PTHREAD_LIBRARY} ${UTIL_LIBRARY})
-			if((NOT DEFINED ENV{QNX_HOST}) AND (NOT APPLE) AND (NOT PIP_FREERTOS))
+			if((NOT DEFINED ENV{QNX_HOST}) AND (NOT APPLE) AND (NOT PIP_MICRO))
 				find_library(RT_LIBRARY rt)
 				list(APPEND _PIP_ADD_LIBS_ ${RT_LIBRARY})
 			endif()

esp-pip/CMakeLists.txt

@@ -17,6 +17,7 @@ list(APPEND COMPONENT_ADD_INCLUDEDIRS "../libs/main/thread")
 set(COMPONENT_PRIV_REQUIRES pthread lwip freertos vfs spi_flash libsodium)
 register_component()
 set(PIP_FREERTOS ON)
+set(PIP_MICRO ON)
 set(LIB OFF)
 set(INCLUDE_DIRS ${IDF_INCLUDE_DIRECTORIES})
 list(APPEND INCLUDE_DIRS $ENV{IDF_PATH}/components/newlib/platform_include)

libs/http_client/pihttpclient.cpp

@@ -59,7 +59,7 @@ bool PIHTTPClient::init() {
 	if (is_cancel) return false;
 	CurlThreadPool::instance();
 	if (!PRIVATE->init()) return false;
-	auto ait = request.queryArguments().makeIterator();
+	auto ait = request.arguments().makeIterator();
 	while (ait.next()) {
 		if (!url.contains('?'))
 			url.append('?');

libs/main/application/pisystemmonitor.cpp

@@ -178,6 +178,9 @@ PISystemTime uint64toST(uint64_t v) {
 void PISystemMonitor::run() {
 	cur_tm.clear();
 	tbid.clear();
+	ProcessStats tstat;
+	tstat.ID = pID_;
+#ifndef PIP_NO_THREADS
 	__PIThreadCollection * pitc = __PIThreadCollection::instance();
 	pitc->lock();
 	PIVector<PIThread *> tv = pitc->threads();
@@ -185,12 +188,10 @@ void PISystemMonitor::run() {
 		if (t->isPIObject()) tbid[t->tid()] = t->name();
 	pitc->unlock();
 	// piCout << tbid.keys().toType<uint>();
-	ProcessStats tstat;
-	tstat.ID = pID_;
-#ifdef MICRO_PIP
+#  ifdef FREERTOS
 	for (auto * t: tv)
 		if (t->isPIObject()) gatherThread(t->tid());
-#else
+#  else // FREERTOS
 #	ifndef WINDOWS
 	double delay_ms = delay_.toMilliseconds();
 	tbid[pID_]      = "main";
@@ -210,7 +211,7 @@ void PISystemMonitor::run() {
 	tstat.cpu_load_user   = 100.f * (PRIVATE->cpu_u_cur - PRIVATE->cpu_u_prev).toMilliseconds() / delay_ms;
 	cycle                 = 0;
 	// piCout << (PRIVATE->cpu_u_cur - PRIVATE->cpu_u_prev).toMilliseconds() / delay_ms;
-#	else
+#	  else  // MAC_OS
 	PRIVATE->file.seekToBegin();
 	PIString str = PIString::fromAscii(PRIVATE->file.readAll());
 	int si = str.find('(') + 1, fi = 0, cc = 1;
@@ -264,8 +265,8 @@ void PISystemMonitor::run() {
 		if (i.flags[PIFile::FileInfo::Dot] || i.flags[PIFile::FileInfo::DotDot]) continue;
 		gatherThread(i.name().toInt());
 	}
-#	endif
-#  else
+#	  endif // MAC_OS
+#	else    // WINDOWS
 	if (GetProcessMemoryInfo(PRIVATE->hProc, &PRIVATE->mem_cnt, sizeof(PRIVATE->mem_cnt)) != 0) {
 		tstat.physical_memsize = PRIVATE->mem_cnt.WorkingSetSize;
 	}
@@ -315,8 +316,9 @@ void PISystemMonitor::run() {
 		tstat.cpu_load_user   = 0.f;
 	}
 	PRIVATE->tm.reset();
-#  endif
-#endif
+#	endif   // WINDOWS
+#  endif     // FREERTOS
+#endif       // PIP_NO_THREADS
 
 	tstat.cpu_load_system = piClampf(tstat.cpu_load_system, 0.f, 100.f);
 	tstat.cpu_load_user   = piClampf(tstat.cpu_load_user, 0.f, 100.f);

libs/main/console/pikbdlistener.cpp

@@ -18,6 +18,8 @@
 */
 #include "pikbdlistener.h"
 
+#ifndef MICRO_PIP
+
 #  include "piincludes_p.h"
 #  include "piliterals.h"
 #  include "piwaitevent_p.h"
@@ -587,3 +589,5 @@ void PIKbdListener::setActive(bool yes) {
 #  endif
 	}
 }
+
+#endif // MICRO_PIP

libs/main/console/pikbdlistener.h

@@ -26,6 +26,10 @@
 #ifndef PIKBDLISTENER_H
 #define PIKBDLISTENER_H
 
+#include "pibase.h"
+
+#ifndef MICRO_PIP
+
 #  include "pithread.h"
 #  include "pitime.h"
 
@@ -305,4 +309,5 @@ REGISTER_PIVARIANTSIMPLE(PIKbdListener::KeyEvent)
 REGISTER_PIVARIANTSIMPLE(PIKbdListener::MouseEvent)
 REGISTER_PIVARIANTSIMPLE(PIKbdListener::WheelEvent)
 
+#endif // MICRO_PIP
 #endif // PIKBDLISTENER_H

libs/main/core/piobject.cpp

@@ -21,6 +21,7 @@
 
 #include "piconditionvar.h"
 #include "pithread.h"
+#include "pitime.h"
 #ifndef MICRO_PIP
 #  include "pifile.h"
 #  include "piiostream.h"

libs/main/core/piwaitevent_p.cpp

@@ -18,6 +18,7 @@
 */
 
 #include "piwaitevent_p.h"
+#ifndef MICRO_PIP
 #  ifdef WINDOWS
 // #  ifdef _WIN32_WINNT
 // #    undef _WIN32_WINNT
@@ -151,3 +152,5 @@ void * PIWaitEvent::getEvent() const {
 	return nullptr;
 #  endif
 }
+
+#endif // MICRO_PIP

libs/main/core/piwaitevent_p.h

@@ -20,6 +20,8 @@
 #ifndef PIWAITEVENT_P_H
 #define PIWAITEVENT_P_H
 
+#ifndef MICRO_PIP
+
 #  include "pibase.h"
 // clang-format off
 #ifdef WINDOWS
@@ -65,4 +67,5 @@ private:
 };
 
 
+#endif // MICRO_PIP
 #endif // PIWAITEVENT_P_H

libs/main/introspection/piintrospection_server_p.cpp

@@ -19,6 +19,8 @@
 
 #include "piintrospection_server_p.h"
 
+#if defined(PIP_INTROSPECTION) && !defined(PIP_FORCE_NO_PIINTROSPECTION)
+
 #  include "pichunkstream.h"
 #  include "piinit.h"
 #  include "piobject.h"
@@ -170,3 +172,5 @@ void PIIntrospection::unpackObjects(PIByteArray & ba, PIVector<PIIntrospection::
 	objects.clear();
 	ba >> objects;
 }
+
+#endif // #if defined(PIP_INTROSPECTION) && !defined(PIP_FORCE_NO_PIINTROSPECTION)

libs/main/introspection/piintrospection_server_p.h

@@ -27,6 +27,7 @@
 #include "piintrospection_threads_p.h"
 #include "pisystemmonitor.h"
 
+#if defined(PIP_INTROSPECTION) && !defined(PIP_FORCE_NO_PIINTROSPECTION)
 
 class PIP_EXPORT PIIntrospection {
 public:
@@ -168,4 +169,5 @@ BINARY_STREAM_READ(PIIntrospection::ObjectInfo) {
 	return s;
 }
 
+#endif // #if defined(PIP_INTROSPECTION) && !defined(PIP_FORCE_NO_PIINTROSPECTION)
 #endif // PIINTROSPECTION_SERVER_P_H

libs/main/introspection/piintrospection_threads_p.cpp

@@ -19,6 +19,7 @@
 
 #include "piintrospection_threads_p.h"
 
+#if defined(PIP_INTROSPECTION) && !defined(PIP_FORCE_NO_PIINTROSPECTION)
 
 PIIntrospectionThreads::ThreadInfo::ThreadInfo() {
 	id = delay = 0;
@@ -78,3 +79,5 @@ void PIIntrospectionThreads::threadRunDone(PIThread * t, ullong us) {
 	ThreadInfo & ti(threads[t]);
 	ti.run_us = (ti.run_us * 0.8) + (us * 0.2); /// WARNING
 }
+
+#endif // #if defined(PIP_INTROSPECTION) && !defined(PIP_FORCE_NO_PIINTROSPECTION)

libs/main/introspection/piintrospection_threads_p.h

@@ -20,6 +20,10 @@
 #ifndef PIINTROSPECTION_THREADS_P_H
 #define PIINTROSPECTION_THREADS_P_H
 
+#include "pibase.h"
+
+#if defined(PIP_INTROSPECTION) && !defined(PIP_FORCE_NO_PIINTROSPECTION)
+
 #include "pimap.h"
 #include "pithread.h"
 
@@ -68,4 +72,5 @@ BINARY_STREAM_READ(PIIntrospectionThreads::ThreadInfo) {
 	return s;
 }
 
+#endif // #if defined(PIP_INTROSPECTION) && !defined(PIP_FORCE_NO_PIINTROSPECTION)
 #endif // PIINTROSPECTION_THREADS_P_H

libs/main/io_devices/pican.cpp

@@ -20,7 +20,7 @@
 
 #include "pipropertystorage.h"
 #include "piwaitevent_p.h"
-#if !defined(WINDOWS) && !defined(MAC_OS) && !defined(MICRO_PIP)
+#if !defined(WINDOWS) && !defined(MAC_OS) && !defined(PIP_NO_SOCKET)
 #  define PIP_CAN
 #endif
 #ifdef PIP_CAN
@@ -39,25 +39,29 @@
 
 REGISTER_DEVICE(PICAN)
 
-
+#ifdef PIP_CAN
 PRIVATE_DEFINITION_START(PICAN)
 	PIWaitEvent event;
 PRIVATE_DEFINITION_END(PICAN)
-
+#endif
 
 PICAN::PICAN(const PIString & path, PIIODevice::DeviceMode mode): PIIODevice(path, mode) {
 	setThreadedReadBufferSize(256);
 	setPath(path);
+#ifdef PIP_CAN
 	can_id = 0;
 	sock   = 0;
 	PRIVATE->event.create();
+#endif
 }
 
 
 PICAN::~PICAN() {
 	stopAndWait();
 	close();
+#ifdef PIP_CAN
 	PRIVATE->event.destroy();
+#endif
 }
 
 
@@ -164,7 +168,9 @@ int PICAN::readedCANID() const {
 
 
 void PICAN::interrupt() {
+#ifdef PIP_CAN
 	PRIVATE->event.interrupt();
+#endif
 }
 
 

libs/main/io_devices/piethernet.cpp

@@ -18,6 +18,8 @@
 */
 #include "piethernet.h"
 
+#ifndef PIP_NO_SOCKET
+
 #  include "piconfig.h"
 #  include "piconstchars.h"
 #  include "piincludes_p.h"
@@ -25,7 +27,7 @@
 #  include "pipropertystorage.h"
 #  include "pisysteminfo.h"
 #  include "pitranslator.h"
-// clang-format off
+
 #  ifdef QNX
 #	include <arpa/inet.h>
 #	include <fcntl.h>
@@ -49,21 +51,21 @@
 #  else
 #	ifdef WINDOWS
 #	  include <io.h>
-#    include <winsock2.h>
 #	  include <iphlpapi.h>
 #	  include <psapi.h>
+#	  include <winsock2.h>
 #	  include <ws2tcpip.h>
 #	  define ip_mreqn    ip_mreq
 #	  define imr_address imr_interface
 #	else
+#	  include <arpa/inet.h>
 #	  include <fcntl.h>
-#    include <sys/ioctl.h>
+#	  include <net/if.h>
+#	  include <netdb.h>
 #	  include <netinet/in.h>
 #	  include <netinet/tcp.h>
-#    include <arpa/inet.h>
+#	  include <sys/ioctl.h>
 #	  include <sys/socket.h>
-#    include <netdb.h>
-#    include <net/if.h>
 #	  if !defined(ANDROID) && !defined(LWIP)
 #		include <ifaddrs.h>
 #	  endif
@@ -72,7 +74,6 @@
 #	  endif
 #	endif
 #  endif
-// clang-format on
 #  include "piwaitevent_p.h"
 
 #  include <errno.h>
@@ -196,7 +197,7 @@ void PIEthernet::construct() {
 	setMulticastTTL(1);
 	server_thread_.setData(this);
 	server_thread_.setName("_S.tcpserver"_a);
-#ifdef MICRO_PIP
+#  ifdef LWIP
 	setThreadedReadBufferSize(512);
 #  else
 	setThreadedReadBufferSize(64_KiB);
@@ -1170,7 +1171,7 @@ PIEthernet::InterfaceList PIEthernet::interfaces() {
 	}
 	if (pAdapterInfo) HeapFree(GetProcessHeap(), 0, pAdapterInfo);
 #  else
-#  ifdef MICRO_PIP
+#	ifdef LWIP
 #	else
 #	  ifdef ANDROID
 	struct ifconf ifc;
@@ -1282,7 +1283,7 @@ PIEthernet::InterfaceList PIEthernet::interfaces() {
 
 
 PINetworkAddress PIEthernet::interfaceAddress(const PIString & interface_) {
-#if defined(WINDOWS) || defined(MICRO_PIP)
+#  if defined(WINDOWS) || defined(LWIP)
 	piCout << "[PIEthernet] Not implemented, use \"PIEthernet::allAddresses\" or \"PIEthernet::interfaces\" instead";
 	return PINetworkAddress();
 #  else
@@ -1486,3 +1487,5 @@ bool PIEthernet::ethIsWriteable(int sock) {
 	return ret == 0;
 #  endif
 }
+
+#endif // PIP_NO_SOCKET

libs/main/io_devices/piethernet.h

@@ -26,9 +26,12 @@
 #ifndef PIETHERNET_H
 #define PIETHERNET_H
 
+
 #include "piiodevice.h"
 #include "pinetworkaddress.h"
 
+#ifndef PIP_NO_SOCKET
+
 #  ifdef ANDROID
 struct
 #  else
@@ -536,4 +539,5 @@ inline bool operator!=(const PIEthernet::Interface & v0, const PIEthernet::Inter
 	return (v0.name != v1.name || v0.address != v1.address || v0.netmask != v1.netmask);
 }
 
+#endif // PIP_NO_SOCKET
 #endif // PIETHERNET_H

libs/main/io_devices/pifile.cpp

@@ -45,7 +45,7 @@
 #  include <utime.h>
 #endif
 #define S_IFHDN 0x40
-#if defined(QNX) || defined(ANDROID) || defined(FREERTOS)
+#if defined(QNX) || defined(ANDROID) || defined(MICRO_PIP)
 #  define _fopen_call_  fopen
 #  define _fseek_call_  fseek
 #  define _ftell_call_  ftell

libs/main/io_devices/piserial.cpp

@@ -19,6 +19,8 @@
 
 #include "piserial.h"
 
+#ifndef MICRO_PIP
+
 #  include "piconfig.h"
 #  include "pidir.h"
 #  include "piincludes_p.h"
@@ -29,9 +31,6 @@
 
 #  include <errno.h>
 
-#if defined(MICRO_PIP)
-#  define PISERIAL_NO_PINS
-#endif
 #  if defined(PISERIAL_NO_PINS) || defined(WINDOWS)
 #	define TIOCM_LE  1
 #	define TIOCM_DTR 4
@@ -1318,3 +1317,5 @@ void PISerial::threadedReadBufferSizeChanged() {
 	// piCoutObj << "a" << ss.xmit_fifo_size;
 #  endif
 }
+
+#endif // MICRO_PIP

libs/main/piplatform.h

@@ -51,8 +51,14 @@
 #ifdef PIP_FREERTOS
 #  define FREERTOS
 #endif
-#if defined(FREERTOS) || defined(PLATFORMIO)
-#  define MICRO_PIP
+#ifdef MICRO_PIP
+#  ifndef FREERTOS
+#	define PIP_NO_THREADS
+#  endif
+#  ifndef LWIP
+#	define PIP_NO_SOCKET
+#  endif
+#  define PISERIAL_NO_PINS
 #endif
 #ifndef WINDOWS
 #  ifndef QNX

libs/main/serialization/pijson.cpp

@@ -400,9 +400,9 @@ PIJSON PIJSON::parseValue(PIString & s) {
 	s.trim();
 	if (s.isEmpty()) return ret;
 	if (s[0] == '{') {
-		ret = parseObject(s.takeRange('{', '}').trim());
+		ret = parseObject(s.takeRange('{', '}'));
 	} else if (s[0] == '[') {
-		ret = parseArray(s.takeRange('[', ']').trim());
+		ret = parseArray(s.takeRange('[', ']'));
 	} else {
 		s.trim();
 		if (s.startsWith('"')) {

libs/main/serialization/pivaluetree_conversions.cpp

@@ -42,14 +42,6 @@ PIString mask(const PIString & str) {
 	return ret;
 }
 
-PIString overrideFile(PIString path) {
-	if (path.isEmpty()) return {};
-	PIFile::FileInfo fi(path);
-	auto ext = fi.extension();
-	path.insert(path.size_s() - ext.size_s() - (ext.isEmpty() ? 0 : 1), ".override");
-	return path;
-}
-
 
 PIValueTree PIValueTreeConversions::fromPropertyStorage(const PIPropertyStorage & ps) {
 	PIValueTree ret;
@@ -300,11 +292,7 @@ PIString toTextTree(const PIValueTree & root, PIString prefix, PIValueTreeConver
 		ret += "\n[" + prefix + "]\n";
 		if (root.isArray() && options[PIValueTreeConversions::WithAttributes]) ret += toTextTreeAttributes(root, "", options);
 		for (const auto & c: root.children()) {
-			if (c.hasChildren()) continue;
-			ret += toTextTree(c, prefix, options);
-		}
-		for (const auto & c: root.children()) {
-			if (!c.hasChildren()) continue;
+			PIString cp = prefix;
 			ret += toTextTree(c, prefix, options);
 		}
 	} else {
@@ -327,13 +315,9 @@ PIString toTextTree(const PIValueTree & root, PIString prefix, PIValueTreeConver
 PIString PIValueTreeConversions::toText(const PIValueTree & root, Options options) {
 	PIString ret;
 	for (const auto & c: root.children()) {
-		if (c.hasChildren()) continue;
-		ret += toTextTree(c, {}, options);
-	}
-	for (const auto & c: root.children()) {
-		if (!c.hasChildren()) continue;
-		ret += toTextTree(c, {}, options);
+		ret += toTextTree(c, PIString(), options);
 	}
+
 	return ret;
 }
 
@@ -345,26 +329,13 @@ PIValueTree PIValueTreeConversions::fromText(const PIString & str) {
 
 
 PIValueTree PIValueTreeConversions::fromJSONFile(const PIString & path) {
-	auto ret = PIValueTreeConversions::fromJSON(PIJSON::fromJSON(PIString::fromUTF8(PIFile::readAll(path))));
-	auto ofp = overrideFile(path);
-	if (PIFile::isExists(ofp)) {
-		auto override_vt = PIValueTreeConversions::fromJSON(PIJSON::fromJSON(PIString::fromUTF8(PIFile::readAll(ofp))));
-		ret.merge(override_vt);
-	}
-	return ret;
+	return PIValueTreeConversions::fromJSON(PIJSON::fromJSON(PIString::fromUTF8(PIFile::readAll(path))));
 }
 
 
 PIValueTree PIValueTreeConversions::fromTextFile(const PIString & path) {
 	PIFile f(path, PIIODevice::ReadOnly);
-	auto ret = PIValueTreeConversions::fromText(&f);
-	auto ofp = overrideFile(path);
-	if (PIFile::isExists(ofp)) {
-		PIFile of(ofp, PIIODevice::ReadOnly);
-		auto override_vt = PIValueTreeConversions::fromText(&of);
-		ret.merge(override_vt);
-	}
-	return ret;
+	return PIValueTreeConversions::fromText(&f);
 }
 
 

libs/main/text/pistring.cpp

@@ -206,10 +206,7 @@ PIString PIString::dtos(const double num, char format, int precision) {
 	if (wr > 4) wr = 4;
 	f[2 + wr] = format;
 	f[3 + wr] = 0;
-	char ch[256];
-	piZeroMemory(ch, 256);
-	snprintf(ch, 256, f, num);
-	return PIStringAscii(ch).replaceAll(',', '.');
+	pisprintf(f, num);
 }
 #undef pisprintf
 

libs/main/types/pivaluetree.cpp

@@ -124,23 +124,6 @@ void PIValueTree::applyValues(const PIValueTree & root, bool recursive) {
 }
 
 
-void PIValueTree::merge(const PIValueTree & root) {
-	if (_is_null) return;
-	for (const auto & c: root._children) {
-		bool found = false;
-		for (auto & i: _children) {
-			if (c.name() == i.name()) {
-				if (c.isValid()) i._value = c._value;
-				i.merge(c);
-				found = true;
-				break;
-			}
-		}
-		if (!found) _children << c;
-	}
-}
-
-
 PIVariant PIValueTree::childValue(const PIString & child_name, const PIVariant & default_value, bool * exists) const {
 	const PIValueTree & node = child(child_name);
 	if (node.isNull()) {

libs/main/types/pivaluetree.h

@@ -170,13 +170,6 @@ public:
 	//! \param recursive Если установлено в true, то значения будут применяться рекурсивно к дочерним узлам.
 	void applyValues(const PIValueTree & root, bool recursive = true);
 
-	//! \~\brief
-	//! \~english Set or add the values of a given %PIValueTree object to the current %PIValueTree object.
-	//! \param root The %PIValueTree object whose values are to be merged.
-	//! \~russian Устанавливает или добавляет значения данного объекта %PIValueTree к текущему объекту %PIValueTree.
-	//! \param root Объект %PIValueTree, значения которого должны быть добавлены.
-	void merge(const PIValueTree & root);
-
 	//! \~\brief
 	//! \~english Returns the children of the current %PIValueTree object.
 	//! \~russian Возвращает дочерние элементы текущего объекта %PIValueTree.

utils/value_tree_translator/main.cpp

@@ -72,7 +72,7 @@ const PIString contextName = "QAD::PIValueTreeEdit";
 
 
 void gatherStrings(TSFile::Context & context, const PIValueTree & vt, const PIString & loc) {
-	const static PIStringList attrs({Attribute::prefix, Attribute::suffix, Attribute::toolTip});
+	const static PIStringList attrs({Attribute::prefix, Attribute::suffix});
 	for (const auto & c: vt.children()) {
 		context.confirm(c.name(), loc);
 		context.confirm(c.comment(), loc);