[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdeedu/kalgebra
From:       Aleix Pol Gonzalez <aleixpol () gmail ! com>
Date:       2011-02-14 18:46:33
Message-ID: 20110214184633.3E70AAC8BC () svn ! kde ! org
[Download RAW message or body]

SVN commit 1220691 by apol:

Also move variantToExpression to analitzautils.


 M  +20 -0     analitza/analitzautils.cpp  
 M  +3 -0      analitza/analitzautils.h  
 M  +1 -21     mobile/analitzawrapper.cpp  


--- trunk/KDE/kdeedu/kalgebra/analitza/analitzautils.cpp #1220690:1220691
@@ -385,4 +385,24 @@
 	return ret;
 }
 
+Analitza::Expression variantToExpression(const QVariant& v)
+{
+	if(v.canConvert(QVariant::Double))
+		return Analitza::Expression(Analitza::Cn(v.toReal()));
+	else if(v.canConvert(QVariant::List)) {
+		QVariantList list = v.toList();
+		QList<Analitza::Expression> expressionList;
+		
+		foreach(const QVariant& elem, list) {
+			expressionList << variantToExpression(elem);
 }
+		
+		return Analitza::Expression::constructList(expressionList);
+	} else if(v.canConvert(QVariant::String))
+		return Analitza::Expression(v.toString());
+	
+	Q_ASSERT(false && "couldn't figure out the type");
+	return Analitza::Expression();
+}
+
+}
--- trunk/KDE/kdeedu/kalgebra/analitza/analitzautils.h #1220690:1220691
@@ -57,6 +57,9 @@
 	
 	/** Creates a QVariant out of an Expression @p res */
 	QVariant ANALITZA_EXPORT expressionToVariant(const Analitza::Expression& res);
+	
+	/** Creates an expression out of a QVariant @p v, it will assert if it's not the correct type. */
+	Analitza::Expression ANALITZA_EXPORT variantToExpression(const QVariant& v);
 }
 
 #endif // ANALITZAUTILS_H
--- trunk/KDE/kdeedu/kalgebra/mobile/analitzawrapper.cpp #1220690:1220691
@@ -56,26 +56,6 @@
 	return AnalitzaUtils::expressionToVariant(res);
 }
 
-Analitza::Expression variantToExpression(const QVariant& v)
-{
-	if(v.canConvert(QVariant::Double))
-		return Analitza::Expression(Analitza::Cn(v.toReal()));
-	else if(v.canConvert(QVariant::List)) {
-		QVariantList list = v.toList();
-		QList<Analitza::Expression> expressionList;
-		
-		foreach(const QVariant& elem, list) {
-			expressionList << variantToExpression(elem);
-		}
-		
-		return Analitza::Expression::constructList(expressionList);
-	} else if(v.canConvert(QVariant::String))
-		return Analitza::Expression(v.toString());
-	
-	Q_ASSERT(false && "couldn't figure out the type");
-	return Analitza::Expression();
-}
-
 QVariant AnalitzaWrapper::executeFunc(const QString& name, const QVariantList& args)
 {
 	if(!m_wrapped->variables()->contains(name)) {
@@ -86,7 +66,7 @@
 	QStack<Analitza::Object*> stack;
 	QList<Analitza::Expression> exps;
 	foreach(const QVariant& v, args) {
-		exps += variantToExpression(v);
+		exps += AnalitzaUtils::variantToExpression(v);
 		stack << exps.last().tree();
 	}
 	
[prev in list] [next in list] [prev in thread] [next in thread]