diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2019-06-01 22:13:32 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2019-06-01 22:13:32 +0900 |
| commit | cc5064c8b29c0af8d300f5c5197be5dcb92c8f6d (patch) | |
| tree | aad4839c160b2fad055061bd7937df91f5882bc1 | |
| parent | 7004f06df8a38a4a955034ca30f3b6784a31e770 (diff) | |
| download | kvirc-cc5064c8.tar.gz kvirc-cc5064c8.zip | |
Adjusted to use new TQStringVariantMap type.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
| -rw-r--r-- | src/modules/dcc/canvaswidget.cpp | 4 | ||||
| -rw-r--r-- | src/modules/dcc/canvaswidget.h | 12 |
2 files changed, 8 insertions, 8 deletions
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 @@ void KviCanvasItemPropertiesWidget::editItem(TQCanvasItem * it) return; } - TQMap<TQString,TQVariant> * m = 0; + TQStringVariantMap * m = 0; switch(KVI_CANVAS_RTTI_CONTROL_TYPE(it)) { @@ -1474,7 +1474,7 @@ void KviCanvasItemPropertiesWidget::editItem(TQCanvasItem * it) 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); 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 @@ public: 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 @@ public: 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 @@ protected: 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 @@ public: 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); |