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

cd_utils/pult/cd_kmodel.h

@@ -1,9 +1,13 @@
 #ifndef CD_KMODEL_H
 #define CD_KMODEL_H
 
-#include "cdutils_k.h"
+//#include "cdutils_k.h"
 #include <QAbstractItemModel>
+#include "pistring.h"
 
+namespace CDUtils {
+class CDSection;
+}
 class CDKItemModel;
 
 class CDKItem {
@@ -12,11 +16,12 @@ public:
 	enum CDKItemType{ItemCDType, ItemCDSection};
 	CDKItem(int index, CDKItemType type, CDKItem * parent);
 	~CDKItem();
-	QVariant data(int column) const;
+	QVariant data(int column, int role) const;
 	bool setData(int column, const QVariant & value);
 
 private:
 	PIDeque<int> buildPath() const;
+	QString stringType(const PIString & t) const;
 
 	CDKItem * parent_;
 	int index_;
@@ -40,7 +45,7 @@ public:
 	bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
 
 	void rebuildModel();
-	void buildItem(CDKItem * it, CDUtils::CDSection r);
+	void buildItem(CDKItem * it, CDUtils::CDSection &r);
 
 public slots: