diff --git a/libs/graphic/graphic_conf.cpp b/libs/graphic/graphic_conf.cpp
index dfda63b..f6df9cf 100644
--- a/libs/graphic/graphic_conf.cpp
+++ b/libs/graphic/graphic_conf.cpp
@@ -5,23 +5,15 @@
 
 // GraphicType
 
-GraphicType::GraphicType(QString name_, QColor color, Qt::PenStyle style, double width, bool visible_) {
+GraphicType::GraphicType(QString name_, QColor color, Qt::PenStyle style, double width, bool visible_): name(name_), visible(visible_) {
 	pen.setColor(color);
 	pen.setStyle(style);
-	lines      = true;
-	points     = false;
-	fill       = false;
-	fill_color = Qt::yellow;
 	if (qRound(width) == width)
 		pen.setWidth(qRound(width));
 	else
 		pen.setWidthF(width);
 	pen.setWidth(1);
 	pen.setCosmetic(true);
-	max_x      = 0.;
-	name       = name_;
-	visible    = visible_;
-	pointWidth = 2.;
 }
 
 
diff --git a/libs/graphic/graphic_conf.h b/libs/graphic/graphic_conf.h
index 12d0182..f1b8fb3 100644
--- a/libs/graphic/graphic_conf.h
+++ b/libs/graphic/graphic_conf.h
@@ -49,16 +49,16 @@ struct QAD_GRAPHIC_EXPORT GraphicType {
 	QVector<QPolygonF> _lod;
 	QVector<QPolygonF> _lod_pause;
 	QPen pen;
-	QColor fill_color;
-	bool lines;
-	bool points;
-	bool fill;
-	double pointWidth;
-	double max_x;
-	double max_x_pause;
-	QCheckBox * pb = nullptr;
+	QColor fill_color  = Qt::yellow;
+	bool lines         = true;
+	bool points        = false;
+	bool fill          = false;
+	double pointWidth  = 2.;
+	double max_x       = 0.;
+	double max_x_pause = 0.;
+	QCheckBox * pb     = nullptr;
 	QIcon icon;
-	bool visible;
+	bool visible = true;
 	QRectF cvrect;
 	int last_lod = 0;
 };
diff --git a/libs/piqt_utils/piqt_connection_edit.cpp b/libs/piqt_utils/piqt_connection_edit.cpp
index e5e1ac1..e14c4d8 100644
--- a/libs/piqt_utils/piqt_connection_edit.cpp
+++ b/libs/piqt_utils/piqt_connection_edit.cpp
@@ -20,7 +20,7 @@ ConnectionEdit::ConnectionEdit(QWidget * parent): QDialog(parent) {
 	conn                      = 0;
 	PICodeInfo::EnumInfo * ei = PICODEINFO::enums().value("PIIODevice::DeviceMode");
 	if (ei) {
-		piForeachC(PICodeInfo::EnumeratorInfo & e, ei->members)
+		for (const auto & e: ei->members)
 #if PIP_VERSION >= PIP_MAKE_VERSION(2, 39, 0)
 			ui->comboMode->addItem(PI2QString(e.name.toString() + " (" + PIString::fromNumber(e.value) + ")"),
 			                       QVariant::fromValue<int>(e.value));
@@ -31,7 +31,7 @@ ConnectionEdit::ConnectionEdit(QWidget * parent): QDialog(parent) {
 	ui->comboMode->setCurrentIndex(ui->comboMode->count() - 1);
 	ei = PICODEINFO::enums().value("PIIODevice::DeviceOption");
 	if (ei) {
-		piForeachC(PICodeInfo::EnumeratorInfo & e, ei->members) {
+		for (const auto & e: ei->members) {
 			QCheckBox * cb = new QCheckBox();
 #if PIP_VERSION >= PIP_MAKE_VERSION(2, 39, 0)
 			cb->setText(PI2QString(e.name.toString() + " (" + PIString::fromNumber(e.value) + ")"));
@@ -44,7 +44,7 @@ ConnectionEdit::ConnectionEdit(QWidget * parent): QDialog(parent) {
 	}
 	ei = PICODEINFO::enums().value("PIPacketExtractor::SplitMode");
 	if (ei) {
-		piForeachC(PICodeInfo::EnumeratorInfo & e, ei->members)
+		for (const auto & e: ei->members)
 #if PIP_VERSION >= PIP_MAKE_VERSION(2, 39, 0)
 			ui->comboSplit->addItem(PI2QString(e.name.toString() + " (" + PIString::fromNumber(e.value) + ")"),
 			                        QVariant::fromValue<int>(e.value));
diff --git a/libs/piqt_utils/piqt_connection_view.cpp b/libs/piqt_utils/piqt_connection_view.cpp
index 2ceac0e..7e9a242 100644
--- a/libs/piqt_utils/piqt_connection_view.cpp
+++ b/libs/piqt_utils/piqt_connection_view.cpp
@@ -85,7 +85,7 @@ void FilterItem::rename() {
 	QString ms;
 	PICodeInfo::EnumInfo * ei = PICODEINFO::enums().value("PIPacketExtractor::SplitMode", 0);
 	if (ei) {
-		piForeachC(PICodeInfo::EnumeratorInfo & i, ei->members)
+		for (const auto & i: ei->members)
 			if (i.value == mode()) {
 #if PIP_VERSION >= PIP_MAKE_VERSION(2, 39, 0)
 				ms = PI2QString(i.name.toString());
diff --git a/libs/piqt_utils/piqt_iodevice_edit_dialog.cpp b/libs/piqt_utils/piqt_iodevice_edit_dialog.cpp
index 5a018bc..6c7b957 100644
--- a/libs/piqt_utils/piqt_iodevice_edit_dialog.cpp
+++ b/libs/piqt_utils/piqt_iodevice_edit_dialog.cpp
@@ -13,7 +13,7 @@ IODeviceEditDialog::IODeviceEditDialog(QWidget * parent): QDialog(parent) {
 	ui->setupUi(this);
 	PICodeInfo::EnumInfo * ei = PICODEINFO::enums().value("PIIODevice::DeviceMode");
 	if (ei) {
-		piForeachC(PICodeInfo::EnumeratorInfo & e, ei->members)
+		for (const auto & e: ei->members)
 #if PIP_VERSION >= PIP_MAKE_VERSION(2, 39, 0)
 			ui->comboMode->addItem(PI2QString(e.name.toString() + " (" + PIString::fromNumber(e.value) + ")"),
 			                       QVariant::fromValue<int>(e.value));
@@ -24,7 +24,7 @@ IODeviceEditDialog::IODeviceEditDialog(QWidget * parent): QDialog(parent) {
 	ui->comboMode->setCurrentIndex(ui->comboMode->count() - 1);
 	ei = PICODEINFO::enums().value("PIIODevice::DeviceOption");
 	if (ei) {
-		piForeachC(PICodeInfo::EnumeratorInfo & e, ei->members) {
+		for (const auto & e: ei->members) {
 			QCheckBox * cb = new QCheckBox();
 #if PIP_VERSION >= PIP_MAKE_VERSION(2, 39, 0)
 			cb->setText(PI2QString(e.name.toString() + " (" + PIString::fromNumber(e.value) + ")"));
@@ -36,7 +36,7 @@ IODeviceEditDialog::IODeviceEditDialog(QWidget * parent): QDialog(parent) {
 		}
 	}
 	PIStringList pl = PIIODevice::availablePrefixes();
-	piForeachC(PIString & p, pl) {
+	for (const auto & p: pl) {
 		ui->comboType->addItem(PI2QString(p));
 	}
 }
diff --git a/utils/piintrospector/containers_view.cpp b/utils/piintrospector/containers_view.cpp
index 7d962be..3264c5a 100644
--- a/utils/piintrospector/containers_view.cpp
+++ b/utils/piintrospector/containers_view.cpp
@@ -28,10 +28,10 @@ ContainersModel::ContainersModel() {
 void ContainersModel::update(const PIVector<PIIntrospectionContainers::TypeInfo> & t) {
 	prev_data.clear();
 	all.fill(0U);
-	piForeachC(PIIntrospectionContainers::TypeInfo & i, cur_data) {
+	for (const auto & i: cur_data) {
 		prev_data[i.id] = i;
 	}
-	piForeachC(PIIntrospectionContainers::TypeInfo & i, t) {
+	for (const auto & i: t) {
 		all[ccCount] += i.count;
 #if PIP_VERSION >= PIP_MAKE_VERSION(2, 35, 0)
 		all[ccBytesAllocated] += i.allocated_bytes;
diff --git a/utils/piintrospector/objects_view.cpp b/utils/piintrospector/objects_view.cpp
index 3ac98d1..9219f01 100644
--- a/utils/piintrospector/objects_view.cpp
+++ b/utils/piintrospector/objects_view.cpp
@@ -34,7 +34,7 @@ void ObjectsView::showObjects(const PIVector<PIIntrospection::ObjectInfo> & obje
 
 	int vpos = treeObjects->verticalScrollBar()->value();
 	treeObjects->clear();
-	piForeachC(PIIntrospection::ObjectInfo & i, objects) {
+	for (const auto & i: objects) {
 		stat[PI2QString(i.classname)]++;
 		QTreeWidgetItem * ti = new QTreeWidgetItem();
 		ti->setText(coClassName, PI2QString(i.classname));
diff --git a/utils/piintrospector/piintrospector.cpp b/utils/piintrospector/piintrospector.cpp
index 2ac4536..a65bc56 100644
--- a/utils/piintrospector/piintrospector.cpp
+++ b/utils/piintrospector/piintrospector.cpp
@@ -29,7 +29,7 @@ QPIIntrospector::QPIIntrospector(QWidget * parent): EMainWindow(parent), peer("_
 	session.addEntry(tabWidgetMain);
 	PICodeInfo::EnumInfo * ei = PICODEINFO::enums().value("PIIntrospection::InfoTypes");
 	if (ei) {
-		piForeachC(PICodeInfo::EnumeratorInfo & e, ei->members) {
+		for (const auto & e: ei->members) {
 #if PIP_VERSION >= PIP_MAKE_VERSION(2, 39, 0)
 			QCheckBox * cb = new QCheckBox(PI2QString(e.name.mid(2).toString()));
 #else
@@ -83,7 +83,7 @@ void QPIIntrospector::buildTree(QByteArray d) {
 	PIByteArray pd = Q2PIByteArray(d);
 	pd >> threads;
 	treeContainers->clear();
-	piForeachC (PIIntrospectionThreads::ThreadInfo & t, threads) {
+	for (const auto & t: threads) {
 	    QTreeWidgetItem * ti = new QTreeWidgetItem();
 	    ti->setText(0, QString(PI2QString(t.name) + " (%1)").arg(t.id));
 	    treeContainers->addTopLevelItem(ti);
@@ -241,7 +241,7 @@ void QPIIntrospector::peersChanged(const PIString & name) {
 	QString cs = listApp->currentItem() ? listApp->currentItem()->text() : "";
 	listApp->clear();
 	peer.lock();
-	piForeachC(PIPeer::PeerInfo & p, peer.allPeers()) {
+	for (const auto & p: peer.allPeers()) {
 		QString pn = PI2QString(p.name);
 		if (!pn.contains(tag)) continue;
 		QListWidgetItem * li = new QListWidgetItem(pn.left(pn.indexOf(tag)));
diff --git a/utils/piintrospector/threads_view.cpp b/utils/piintrospector/threads_view.cpp
index 9edc223..ae8bbac 100644
--- a/utils/piintrospector/threads_view.cpp
+++ b/utils/piintrospector/threads_view.cpp
@@ -24,7 +24,7 @@ enum ColumnThreads {
 ThreadsModel::ThreadsModel() {
 	PICodeInfo::EnumInfo * ei = PICODEINFO::enums().value("PIIntrospectionThreads::ThreadState");
 	if (ei) {
-		piForeachC(PICodeInfo::EnumeratorInfo & e, ei->members) {
+		for (const auto & e: ei->members) {
 #if PIP_VERSION >= PIP_MAKE_VERSION(2, 39, 0)
 			state_names[e.value] = PI2QString(e.name.mid(1).toString());
 #else
@@ -118,7 +118,7 @@ QVariant ThreadsModel::data(const QModelIndex & index, int role) const {
 		case ctDelay: return QString::number(ti.delay);
 		case ctState: return state_names.value(ti.state);
 		case ctLoad: {
-			piForeachC(PISystemMonitor::ThreadStats & s, stat) {
+			for (const auto & s: stat) {
 				if (s.id == llong(ti.id)) {
 					return QString::number(s.cpu_load_kernel + s.cpu_load_user, 'f', 2) + " %";
 				}