git-svn-id: svn://db.shs.com.ru/libs@459 a8b55f48-bf90-11e4-a774-851b48703e85

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"

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;
 		}
 	}