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

cd_utils/pult/cd_pult.h

@@ -23,8 +23,8 @@
 #include "session_manager.h"
 #include "qpievaluator.h"
 #include "cdutils_k.h"
+#include "cd_kmodel.h"
 
-using namespace CDUtils;
 
 namespace Ui {
 	class CD_Pult;
@@ -50,7 +50,7 @@ private:
 	void progress(int val, int max);
 	void clearSelected();
 	QString typeName(const QString & n) const;
-	void makeTreeSection(CDSection & ks, QTreeWidgetItem * pi);
+	void makeTreeSection(CDUtils::CDSection & ks, QTreeWidgetItem * pi);
 	
 	EVENT_HANDLER1(void, received, bool, ok);
 	EVENT_HANDLER(void, pip_sendFailed) {emit q_k_sendFailed();}
@@ -70,6 +70,7 @@ private:
 	QPIEvaluator eval;
 	SessionManager session;
 	QPIConfig config;
+	CDKItemModel * kmodel;
 	//QVector<float> k, x;
 	int clear_target, timer;
 	bool needWrite, isPause, need_update, show_x;