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

List:       kde-commits
Subject:    kdenonbeta/kxslt
From:       Frans Englich <frans.englich () telia ! com>
Date:       2005-09-30 21:59:27
Message-ID: 1128117567.408961.27672.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 465817 by englich:

Had this lying around. Was an alignment with the error code changes in KXPath.


 M  +0 -5      TODO  
 M  +1 -7      functions/FunctionAvailableFN.cpp  
 M  +1 -4      functions/SystemPropertyFN.cpp  


--- trunk/kdenonbeta/kxslt/TODO #465816:465817
@@ -3,9 +3,4 @@
 
 * There are obvious clashes between names in xpath/ and xslt/ that needs to be fixed over time. Files
 	like StaticContext.h problably needs to be renamed to XPathStaticContext.
-
-* Some of the functions are reporting invalid error codes, due to them not being available. The error
-	code enum should probably be in kxslt/, but the question is how. Perhaps an own XSLTStaticContext that
-	inherits from its own XSLTErrorContext, or somekind of abstraction, that error codes aren't identified
-	by enums..
 	
--- trunk/kdenonbeta/kxslt/functions/FunctionAvailableFN.cpp #465816:465817
@@ -32,11 +32,6 @@
 
 using namespace KXSLT;
 
-/*
- * TODO:
- * - Add the error code to the issueDynamicError() call
- */
-
 KXPATH::Item::Ptr FunctionAvailableFN::evaluateSingleton(const KXPATH::DynamicContext::Ptr &context)
 {
 	/* This codepath should never be run if a compress was successful. */
@@ -50,8 +45,7 @@
 		context->issueDynamicError(i18n("The name passed to the function-available() function "
 									"must be a valid QName, such as \"fn:starts-with\". "
 									"\"%1\" is not a valid QName.").arg(qname.string()),
-									KXPATH::ReportContext::FONC0001);
-	// TODO the error code is wrong, it should be XTDE1400
+									KXPATH::ReportContext::XTDE1400);
 
 
 	KDOM::DOMStringImpl *prefix, *local, *ns;
--- trunk/kdenonbeta/kxslt/functions/SystemPropertyFN.cpp #465816:465817
@@ -37,8 +37,6 @@
  * if the value is not a valid QName, or if there is no 
  * namespace declaration in scope for the prefix of the QName."
  * The second condition is not handled.
- *
- * - Add the error code to the issueDynamicError() call
  */
 
 KXPATH::Item::Ptr SystemPropertyFN::evaluateSingleton(const KXPATH::DynamicContext::Ptr &context)
@@ -51,8 +49,7 @@
 		context->issueDynamicError(i18n("The name passed to the system-property() function "
 									"must be a valid QName, such as \"xsl:is-schema-aware\". "
 									"\"%1\" is not a valid QName.").arg(qname.string()),
-									KXPATH::ReportContext::FORG0003);
-		// TODO Add error codes to ErrorContext..? (this one is wrong, it should XTDE1390)
+									KXPATH::ReportContext::XTDE1390);
 	}
 
 	KDOM::DOMStringImpl *prefix = 0;
[prev in list] [next in list] [prev in thread] [next in thread]