Merge commit '28cd389695248b56a99a417bc10640bb3e99c298'

sources/pugixml/pugiconfig.hpp

@@ -1,74 +1,77 @@
-/**
+/**
- * pugixml parser - version 1.10
+ * pugixml parser - version 1.11
- * --------------------------------------------------------
+ * --------------------------------------------------------
- * Copyright (C) 2006-2019, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com)
+ * Copyright (C) 2006-2020, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com)
- * Report bugs and download new versions at https://pugixml.org/
+ * Report bugs and download new versions at https://pugixml.org/
- *
+ *
- * This library is distributed under the MIT License. See notice at the end
+ * This library is distributed under the MIT License. See notice at the end
- * of this file.
+ * of this file.
- *
+ *
- * This work is based on the pugxml parser, which is:
+ * This work is based on the pugxml parser, which is:
- * Copyright (C) 2003, by Kristen Wegner (kristen@tima.net)
+ * Copyright (C) 2003, by Kristen Wegner (kristen@tima.net)
- */
+ */
-
+
-#ifndef HEADER_PUGICONFIG_HPP
+#ifndef HEADER_PUGICONFIG_HPP
-#define HEADER_PUGICONFIG_HPP
+#define HEADER_PUGICONFIG_HPP
-
+
-// Uncomment this to enable wchar_t mode
+// Uncomment this to enable wchar_t mode
-// #define PUGIXML_WCHAR_MODE
+// #define PUGIXML_WCHAR_MODE
-
+
-// Uncomment this to enable compact mode
+// Uncomment this to enable compact mode
-// #define PUGIXML_COMPACT
+// #define PUGIXML_COMPACT
-
+
-// Uncomment this to disable XPath
+// Uncomment this to disable XPath
-// #define PUGIXML_NO_XPATH
+// #define PUGIXML_NO_XPATH
-
+
-// Uncomment this to disable STL
+// Uncomment this to disable STL
-// #define PUGIXML_NO_STL
+// #define PUGIXML_NO_STL
-
+
-// Uncomment this to disable exceptions
+// Uncomment this to disable exceptions
-// #define PUGIXML_NO_EXCEPTIONS
+// #define PUGIXML_NO_EXCEPTIONS
-
+
-// Set this to control attributes for public classes/functions, i.e.:
+// Set this to control attributes for public classes/functions, i.e.:
-// #define PUGIXML_API __declspec(dllexport) // to export all public symbols from DLL
+// #define PUGIXML_API __declspec(dllexport) // to export all public symbols from DLL
-// #define PUGIXML_CLASS __declspec(dllimport) // to import all classes from DLL
+// #define PUGIXML_CLASS __declspec(dllimport) // to import all classes from DLL
-// #define PUGIXML_FUNCTION __fastcall // to set calling conventions to all public functions to fastcall
+// #define PUGIXML_FUNCTION __fastcall // to set calling conventions to all public functions to fastcall
-// In absence of PUGIXML_CLASS/PUGIXML_FUNCTION definitions PUGIXML_API is used instead
+// In absence of PUGIXML_CLASS/PUGIXML_FUNCTION definitions PUGIXML_API is used instead
-
+
-// Tune these constants to adjust memory-related behavior
+// Tune these constants to adjust memory-related behavior
-// #define PUGIXML_MEMORY_PAGE_SIZE 32768
+// #define PUGIXML_MEMORY_PAGE_SIZE 32768
-// #define PUGIXML_MEMORY_OUTPUT_STACK 10240
+// #define PUGIXML_MEMORY_OUTPUT_STACK 10240
-// #define PUGIXML_MEMORY_XPATH_PAGE_SIZE 4096
+// #define PUGIXML_MEMORY_XPATH_PAGE_SIZE 4096
-
+
-// Uncomment this to switch to header-only version
+// Tune this constant to adjust max nesting for XPath queries
-// #define PUGIXML_HEADER_ONLY
+// #define PUGIXML_XPATH_DEPTH_LIMIT 1024
-
+
-// Uncomment this to enable long long support
+// Uncomment this to switch to header-only version
-// #define PUGIXML_HAS_LONG_LONG
+// #define PUGIXML_HEADER_ONLY
-
+
-#endif
+// Uncomment this to enable long long support
-
+// #define PUGIXML_HAS_LONG_LONG
-/**
+
- * Copyright (c) 2006-2019 Arseny Kapoulkine
+#endif
- *
+
- * Permission is hereby granted, free of charge, to any person
+/**
- * obtaining a copy of this software and associated documentation
+ * Copyright (c) 2006-2020 Arseny Kapoulkine
- * files (the "Software"), to deal in the Software without
+ *
- * restriction, including without limitation the rights to use,
+ * Permission is hereby granted, free of charge, to any person
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * obtaining a copy of this software and associated documentation
- * copies of the Software, and to permit persons to whom the
+ * files (the "Software"), to deal in the Software without
- * Software is furnished to do so, subject to the following
+ * restriction, including without limitation the rights to use,
- * conditions:
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
- *
+ * copies of the Software, and to permit persons to whom the
- * The above copyright notice and this permission notice shall be
+ * Software is furnished to do so, subject to the following
- * included in all copies or substantial portions of the Software.
+ * conditions:
- *
+ *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * The above copyright notice and this permission notice shall be
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * included in all copies or substantial portions of the Software.
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * OTHER DEALINGS IN THE SOFTWARE.
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- */
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */

sources/qetproject.cpp

@@ -1311,6 +1311,27 @@ void QETProject::readProjectXml(QDomDocument &xml_project)
 					return;
 				}
 			}
+				//Since QElectrotech 0.9 the compatibility with project made with
+				//Qet 0.6 or lower is break;
+			if (conv_ok && m_project_qet_version <= 0.6 )
+			{
+				auto ret = QET::QetMessageBox::warning(
+							   nullptr,
+							   tr("Avertissement ", "message box title"),
+							   tr("Le projet que vous tentez d'ouvrir est partiellement "
+								  "compatible avec votre version de QElectroTech.\n"
+								  "Afin de le rendre totalement compatible veuillez ouvrir ce même projet "
+								  "avec la version 0.8 de QElectroTech sauvegarder le projet "
+								  "et l'ouvrir à  nouveau avec cette version.\n"
+								  "Que désirez vous faire ?"),
+							   QMessageBox::Open | QMessageBox::Cancel);
+
+				if (ret == QMessageBox::Cancel)
+				{
+					m_state = FileOpenDiscard;
+					return;
+				}
+			}
 		}
 		setTitle(root_elmt.attribute("title"));
 	}