Branch: master

cc5064c8 2019-06-01 13:13:32 Michele Calgaro
Adjusted to use new TQStringVariantMap type.

Signed-off-by: Michele Calgaro <michele.calgaro@...>
M src/modules/dcc/canvaswidget.cpp
M src/modules/dcc/canvaswidget.h

src/modules/dcc/canvaswidget.cpp

diff --git a/src/modules/dcc/canvaswidget.cpp b/src/modules/dcc/canvaswidget.cpp
index e18231a..89bbbbd 100644
--- a/src/modules/dcc/canvaswidget.cpp
+++ b/src/modules/dcc/canvaswidget.cpp
@@ -1440,7 +1440,7 @@
 		return;
 	}
 
-	TQMap<TQString,TQVariant> * m = 0;
+	TQStringVariantMap * m = 0;
 
 	switch(KVI_CANVAS_RTTI_CONTROL_TYPE(it))
 	{
@@ -1474,7 +1474,7 @@
 
 	int idx = 0;
 
-	for(TQMap<TQString,TQVariant>::ConstIterator iter = m->begin();iter != m->end();++iter)
+	for(TQStringVariantMap::ConstIterator iter = m->begin();iter != m->end();++iter)
 	{
 		item = new TQTableItem(this,TQTableItem::Never,iter.key().utf8().data());
 		setItem(idx,0,item);

src/modules/dcc/canvaswidget.h

diff --git a/src/modules/dcc/canvaswidget.h b/src/modules/dcc/canvaswidget.h
index 8f17c2d..c2eee55 100644
--- a/src/modules/dcc/canvaswidget.h
+++ b/src/modules/dcc/canvaswidget.h
@@ -72,7 +72,7 @@
 	KviCanvasPolygon(TQCanvas * c,int x,int y,TQPointArray &pnts,double dScaleFactor);
 	virtual ~KviCanvasPolygon();
 protected:
-	TQMap<TQString,TQVariant> m_properties;
+	TQStringVariantMap m_properties;
 	double                 m_dScaleFactor;
 	TQPointArray            m_points;
 public:
@@ -82,7 +82,7 @@
 	void resetPoints();
 	const TQPointArray & internalPoints(){ return m_points; };
 	void setInternalPoints(const TQPointArray &pnts);
-	TQMap<TQString,TQVariant> * properties(){ return &m_properties; };
+	TQStringVariantMap * properties(){ return &m_properties; };
 	virtual void setProperty(const TQString &property,const TQVariant &val);
 	virtual int rtti() const;
 };
@@ -100,11 +100,11 @@
 public:
 	virtual ~KviCanvasRectangleItem();
 protected:
-	TQMap<TQString,TQVariant> m_properties;
+	TQStringVariantMap m_properties;
 public:
 	int right(){ return ((int)x()) + width(); };
 	int bottom(){ return ((int)y()) + height(); };
-	TQMap<TQString,TQVariant> * properties(){ return &m_properties; };
+	TQStringVariantMap * properties(){ return &m_properties; };
 	virtual void setProperty(const TQString &property,const TQVariant &val);
 //	TQVariant property(const TQString &name){ return m_properties[name]; };
 protected:
@@ -167,9 +167,9 @@
 	KviCanvasLine(TQCanvas * c,int x1,int y1,int x2,int y2);
 	virtual ~KviCanvasLine();
 protected:
-	TQMap<TQString,TQVariant> m_properties;
+	TQStringVariantMap m_properties;
 public:
-	TQMap<TQString,TQVariant> * properties(){ return &m_properties; };
+	TQStringVariantMap * properties(){ return &m_properties; };
 	virtual void setProperty(const TQString &property,const TQVariant &val);
 //	TQVariant property(const TQString &name){ return m_properties[name]; };
 	virtual void draw(TQPainter & p);