Branch: master

d67f6826 2019-06-01 08:36:21 Michele Calgaro
Adjusted to use new TQStringVariantMap type.

Signed-off-by: Michele Calgaro <michele.calgaro@...>
M dcoprss/query.cpp
M dcoprss/xmlrpciface.cpp

dcoprss/query.cpp

diff --git a/dcoprss/query.cpp b/dcoprss/query.cpp
index 9c32489..636390e 100644
--- a/dcoprss/query.cpp
+++ b/dcoprss/query.cpp
@@ -173,7 +173,7 @@
 	TQValueList<TQVariant>::ConstIterator it = feedInfos.begin();
 	TQValueList<TQVariant>::ConstIterator end = feedInfos.end();
 	for ( ; it != end; ++it ) {
-		const TQMap<TQString, TQVariant> feedInfo = ( *it ).toMap();
+		const TQStringVariantMap feedInfo = ( *it ).toMap();
 
 		const TQString name = feedInfo[ "sitename" ].toString();
 		const TQString link = feedInfo[ "dataurl" ].toString();

dcoprss/xmlrpciface.cpp

diff --git a/dcoprss/xmlrpciface.cpp b/dcoprss/xmlrpciface.cpp
index 05896d8..8e8e6b8 100644
--- a/dcoprss/xmlrpciface.cpp
+++ b/dcoprss/xmlrpciface.cpp
@@ -214,9 +214,9 @@
 		}
 		case TQVariant::Map: {
 			s += "<struct>";
-			TQMap<TQString, TQVariant> map = arg.toMap();
-			TQMap<TQString, TQVariant>::ConstIterator it = map.begin();
-			TQMap<TQString, TQVariant>::ConstIterator end = map.end();
+			TQStringVariantMap map = arg.toMap();
+			TQStringVariantMap::ConstIterator it = map.begin();
+			TQStringVariantMap::ConstIterator end = map.end();
 			for ( ; it != end; ++it ) {
 				s += "<member>";
 				s += "<name>" + it.key() + "</name>";
@@ -267,7 +267,7 @@
 		}
 		return TQVariant( values );
 	} else if ( typeName == "struct" ) {
-		TQMap<TQString, TQVariant> map;
+		TQStringVariantMap map;
 		TQDomNode memberNode = typeElement.firstChild();
 		while ( !memberNode.isNull() ) {
 			const TQString key = memberNode.toElement().elementsByTagName( "name" ).item( 0 ).toElement().text();