From fee25c7304c3c754ed6176df3f1024705b250ba9 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?= <andrey@signalmodelling.ru>
Date: Sun, 18 Nov 2018 00:19:24 +0000
Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@459
 a8b55f48-bf90-11e4-a774-851b48703e85

---
 piqt/piqt.h                     | 2 +-
 qad/application/emainwindow.cpp | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/piqt/piqt.h b/piqt/piqt.h
index 9eeff18..3fe1a29 100644
--- a/piqt/piqt.h
+++ b/piqt/piqt.h
@@ -2,7 +2,7 @@
 #define PIQT_H
 
 #include "pistring.h"
-#include "pimathmatrix.h"
+#include "pimathvector.h"
 #include "pigeometry.h"
 #include "pitime.h"
 #include "pivariant.h"
diff --git a/qad/application/emainwindow.cpp b/qad/application/emainwindow.cpp
index 0798577..c62e328 100644
--- a/qad/application/emainwindow.cpp
+++ b/qad/application/emainwindow.cpp
@@ -271,7 +271,7 @@ void EMainWindow::changedDock() {
 	if (isHidden()) return;
 	QList<QTabBar * > tabs(findChildren<QTabBar * >());
 	QList<QDockWidget * > docks = findChildren<QDockWidget * >();
-	QSet<QDockWidget * > docks_tabs;
+//	QSet<QDockWidget * > docks_tabs;
 	QDockWidget * dock;
 //	qDebug() << "### change";
 	foreach (QTabBar * t, tabs) {
@@ -289,12 +289,12 @@ void EMainWindow::changedDock() {
 		for (int i = 0; i < t->count(); ++i) {
 			dock = (QDockWidget * )t->tabData(i).toULongLong();
 			//qDebug() << i << t->tabData(i);
-			if (dock == 0) continue;
+			if (!docks.contains(dock)) continue;
 #ifndef Q_OS_MACOS
 			t->setIconSize(dockTabsIconSize());
 #endif
 			t->setTabIcon(i, dock->windowIcon());
-			docks_tabs << dock;
+//			docks_tabs << dock;
 		}
 	}