From 7a16d76753b18e238b5eda8343b8d14a616f00fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?=
 =?UTF-8?q?=D1=80=D0=B5=D0=B9?= <a.bychkov@itelma.su>
Date: Fri, 29 Jul 2022 16:50:38 +0300
Subject: [PATCH] update for PIP3

---
 libs/core/cdutils_c.h        | 2 +-
 libs/core/cdutils_core.h     | 1 +
 libs/core/cdutils_parser.cpp | 4 ++--
 libs/core/cdutils_types.cpp  | 2 +-
 libs/core/cdutils_types.h    | 3 ---
 utils/pult/cdgraphics.cpp    | 2 +-
 6 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/libs/core/cdutils_c.h b/libs/core/cdutils_c.h
index bb67da2..5a08dd7 100644
--- a/libs/core/cdutils_c.h
+++ b/libs/core/cdutils_c.h
@@ -21,7 +21,7 @@
 #define CDUTILS_C_H
 
 #include "cdutils_interface.h"
-#include "cd_core_export.h"
+#include "cdutils_core.h"
 
 
 namespace CDUtils {
diff --git a/libs/core/cdutils_core.h b/libs/core/cdutils_core.h
index f7ca302..1f4d9da 100644
--- a/libs/core/cdutils_core.h
+++ b/libs/core/cdutils_core.h
@@ -31,6 +31,7 @@ namespace CDUtils {
 
 class CDCore;
 
+typedef void (*Handler)(void*);
 
 class CD_CORE_EXPORT __Core_Initializer__ {
 public:
diff --git a/libs/core/cdutils_parser.cpp b/libs/core/cdutils_parser.cpp
index 19a86e3..4da4561 100644
--- a/libs/core/cdutils_parser.cpp
+++ b/libs/core/cdutils_parser.cpp
@@ -63,8 +63,8 @@ PIVector<int> enumValues(const PIString & e, const PIMap<PIString, CDSection> &
 	PIVector<int> ret;
 	enames.clear();
 	if (sections.contains(e)) {
-		ret = sections[e].indexes();
-		enames = sections[e].index_names();
+		ret = sections.at(e).indexes();
+		enames = sections.at(e).index_names();
 	} else {
 		int v = e.toInt();
 		if (v < 2) return ret;
diff --git a/libs/core/cdutils_types.cpp b/libs/core/cdutils_types.cpp
index 076631d..4c796bb 100644
--- a/libs/core/cdutils_types.cpp
+++ b/libs/core/cdutils_types.cpp
@@ -344,7 +344,7 @@ int CDSection::count(bool recursive) const {
 	if (recursive) {
 		PIMap<int, CDSection>::const_iterator i;
 		for (i = s.constBegin(); i != s.constEnd(); ++i)
-			ret += i->second.count(recursive);
+			ret += i.value().count(recursive);
 	}
 	return ret;
 }
diff --git a/libs/core/cdutils_types.h b/libs/core/cdutils_types.h
index d0daa6e..8926a33 100644
--- a/libs/core/cdutils_types.h
+++ b/libs/core/cdutils_types.h
@@ -127,11 +127,8 @@ public:
 	bool test(int v) {return cd.value(v).toBool();}
 //	CDType & operator [](int v) {if (!k.contains(v)) k[v].index_ = v; return k[v];}
 	CDType & operator [](int v) {return cd[v];}
-	const CDType operator [](int v) const {return cd[v];}
 	CDType & operator [](const PIString & name_) {return getByName(name_);}
-	const CDType operator [](const PIString & name_) const {return const_cast<CDSection*>(this)->getByName(name_);}
 	CDType & operator [](const PIDeque<int> & path_) {return getByPath(path_);}
-	const CDType operator [](const PIDeque<int> & path_) const {return const_cast<CDSection*>(this)->getByPath(path_);}
 	CDSection & section(int v);
 	const CDSection section(int v) const;
 
diff --git a/utils/pult/cdgraphics.cpp b/utils/pult/cdgraphics.cpp
index b067683..6d0063b 100644
--- a/utils/pult/cdgraphics.cpp
+++ b/utils/pult/cdgraphics.cpp
@@ -68,7 +68,7 @@ void GDockWidget::addX(const CDType & t) {
 void GDockWidget::drawX(const PIMap<PIString, PIVector<double> > & data) {
 	for (int i = 0; i < x_list.size_s(); ++i) {
 		PIString sp = CDCore::pathToString(x_list[i]);
-		const PIVector<double> & ch(data[sp]);
+		PIVector<double> ch(data.at(sp));
 		for (int j = 0; j < ch.size_s(); ++j)
 			graphic->graphic()->addPoint(ch[j], i, false);
 	}