You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by dm...@apache.org on 2004/08/13 17:49:47 UTC
cvs commit: xml-xalan/c/src/xalanc/XSLT StylesheetConstructionContext.hpp StylesheetConstructionContextDefault.cpp StylesheetConstructionContextDefault.hpp StylesheetExecutionContext.hpp StylesheetExecutionContextDefault.cpp StylesheetExecutionContextDefault.hpp StylesheetHandler.cpp StylesheetHandler.hpp XSLTEngineImpl.cpp XSLTEngineImpl.hpp
dmitryh 2004/08/13 08:49:47
Modified: c/src/xalanc/XSLT StylesheetConstructionContext.hpp
StylesheetConstructionContextDefault.cpp
StylesheetConstructionContextDefault.hpp
StylesheetExecutionContext.hpp
StylesheetExecutionContextDefault.cpp
StylesheetExecutionContextDefault.hpp
StylesheetHandler.cpp StylesheetHandler.hpp
XSLTEngineImpl.cpp XSLTEngineImpl.hpp
Log:
Cleaning obsolete functions with "const char*" parameter
Revision Changes Path
1.7 +0 -35 xml-xalan/c/src/xalanc/XSLT/StylesheetConstructionContext.hpp
Index: StylesheetConstructionContext.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/StylesheetConstructionContext.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- StylesheetConstructionContext.hpp 3 Aug 2004 16:49:53 -0000 1.6
+++ StylesheetConstructionContext.hpp 13 Aug 2004 15:49:47 -0000 1.7
@@ -735,18 +735,6 @@
const LocatorType* locator) const = 0;
virtual void
- error(
- const char* msg,
- const XalanNode* sourceNode = 0,
- const ElemTemplateElement* styleNode = 0) const = 0;
-
- virtual void
- error(
- const char* msg,
- const XalanNode* sourceNode,
- const LocatorType* locator) const = 0;
-
- virtual void
warn(
const XalanDOMString& msg,
const XalanNode* sourceNode = 0,
@@ -759,18 +747,6 @@
const LocatorType* locator) const = 0;
virtual void
- warn(
- const char* msg,
- const XalanNode* sourceNode = 0,
- const ElemTemplateElement* styleNode = 0) const = 0;
-
- virtual void
- warn(
- const char* msg,
- const XalanNode* sourceNode,
- const LocatorType* locator) const = 0;
-
- virtual void
message(
const XalanDOMString& msg,
const XalanNode* sourceNode = 0,
@@ -782,17 +758,6 @@
const XalanNode* sourceNode,
const LocatorType* locator) const = 0;
- virtual void
- message(
- const char* msg,
- const XalanNode* sourceNode = 0,
- const ElemTemplateElement* styleNode = 0) const = 0;
-
- virtual void
- message(
- const char* msg,
- const XalanNode* sourceNode,
- const LocatorType* locator) const = 0;
};
1.10 +0 -67 xml-xalan/c/src/xalanc/XSLT/StylesheetConstructionContextDefault.cpp
Index: StylesheetConstructionContextDefault.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/StylesheetConstructionContextDefault.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- StylesheetConstructionContextDefault.cpp 3 Aug 2004 16:49:53 -0000 1.9
+++ StylesheetConstructionContextDefault.cpp 13 Aug 2004 15:49:47 -0000 1.10
@@ -152,27 +152,6 @@
-void
-StylesheetConstructionContextDefault::error(
- const char* msg,
- const XalanNode* sourceNode,
- const ElemTemplateElement* styleNode) const
-{
- error(TranscodeFromLocalCodePage(msg), sourceNode, styleNode);
-}
-
-
-
-void
-StylesheetConstructionContextDefault::error(
- const char* msg,
- const XalanNode* sourceNode,
- const LocatorType* locator) const
-{
- error(TranscodeFromLocalCodePage(msg), sourceNode, locator);
-}
-
-
void
StylesheetConstructionContextDefault::warn(
@@ -202,29 +181,6 @@
}
-
-void
-StylesheetConstructionContextDefault::warn(
- const char* msg,
- const XalanNode* sourceNode,
- const ElemTemplateElement* styleNode) const
-{
- warn(TranscodeFromLocalCodePage(msg), sourceNode, styleNode);
-}
-
-
-
-void
-StylesheetConstructionContextDefault::warn(
- const char* msg,
- const XalanNode* sourceNode,
- const LocatorType* locator) const
-{
- warn(TranscodeFromLocalCodePage(msg), sourceNode, locator);
-}
-
-
-
void
StylesheetConstructionContextDefault::message(
const XalanDOMString& msg,
@@ -251,29 +207,6 @@
m_processor.message(msg, sourceNode);
}
}
-
-
-
-void
-StylesheetConstructionContextDefault::message(
- const char* msg,
- const XalanNode* sourceNode,
- const ElemTemplateElement* styleNode) const
-{
- message(TranscodeFromLocalCodePage(msg), sourceNode, styleNode);
-}
-
-
-
-void
-StylesheetConstructionContextDefault::message(
- const char* msg,
- const XalanNode* sourceNode,
- const LocatorType* locator) const
-{
- message(TranscodeFromLocalCodePage(msg), sourceNode, locator);
-}
-
void
1.8 +0 -36 xml-xalan/c/src/xalanc/XSLT/StylesheetConstructionContextDefault.hpp
Index: StylesheetConstructionContextDefault.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/StylesheetConstructionContextDefault.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- StylesheetConstructionContextDefault.hpp 3 Aug 2004 16:49:53 -0000 1.7
+++ StylesheetConstructionContextDefault.hpp 13 Aug 2004 15:49:47 -0000 1.8
@@ -166,18 +166,6 @@
const LocatorType* locator) const;
virtual void
- error(
- const char* msg,
- const XalanNode* sourceNode = 0,
- const ElemTemplateElement* styleNode = 0) const;
-
- virtual void
- error(
- const char* msg,
- const XalanNode* sourceNode,
- const LocatorType* locator) const;
-
- virtual void
warn(
const XalanDOMString& msg,
const XalanNode* sourceNode = 0,
@@ -190,18 +178,6 @@
const LocatorType* locator) const;
virtual void
- warn(
- const char* msg,
- const XalanNode* sourceNode = 0,
- const ElemTemplateElement* styleNode = 0) const;
-
- virtual void
- warn(
- const char* msg,
- const XalanNode* sourceNode,
- const LocatorType* locator) const;
-
- virtual void
message(
const XalanDOMString& msg,
const XalanNode* sourceNode = 0,
@@ -212,18 +188,6 @@
const XalanDOMString& msg,
const XalanNode* sourceNode,
const LocatorType* locator) const;
-
- virtual void
- message(
- const char* msg,
- const XalanNode* sourceNode = 0,
- const ElemTemplateElement* styleNode = 0) const;
-
- virtual void
- message(
- const char* msg,
- const XalanNode* sourceNode,
- const LocatorType* locator) const;
// These interfaces are inherited from StylesheetConstructionContext...
1.22 +0 -57 xml-xalan/c/src/xalanc/XSLT/StylesheetExecutionContext.hpp
Index: StylesheetExecutionContext.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/StylesheetExecutionContext.hpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- StylesheetExecutionContext.hpp 31 Jul 2004 06:05:08 -0000 1.21
+++ StylesheetExecutionContext.hpp 13 Aug 2004 15:49:47 -0000 1.22
@@ -138,19 +138,6 @@
const XalanNode* sourceNode = 0) const = 0;
/**
- * Report an error and throw an exception.
- *
- * @param msg The text of the message.
- * @param styleNode The stylesheet node were the error occurred.
- * @param sourceNode The source node where the error occurred. May be 0.
- */
- virtual void
- error(
- const char* msg,
- const ElemTemplateElement& styleNode,
- const XalanNode* sourceNode = 0) const = 0;
-
- /**
* Report a warning.
*
* @param msg The text of the message.
@@ -164,19 +151,6 @@
const XalanNode* sourceNode = 0) const = 0;
/**
- * Report a warning.
- *
- * @param msg The text of the message.
- * @param styleNode The stylesheet node were the warning occurred.
- * @param sourceNode The source node where the warning occurred. May be 0.
- */
- virtual void
- warn(
- const char* msg,
- const ElemTemplateElement& styleNode,
- const XalanNode* sourceNode = 0) const = 0;
-
- /**
* Report a message.
*
* @param msg The text of the message.
@@ -191,19 +165,6 @@
/**
- * Report a message.
- *
- * @param msg The text of the message.
- * @param styleNode The stylesheet node were the message occurred.
- * @param sourceNode The source node where the message occurred. May be 0.
- */
- virtual void
- message(
- const char* msg,
- const ElemTemplateElement& styleNode,
- const XalanNode* sourceNode = 0) const = 0;
-
- /**
* Determine whether conflicts should be reported.
*
* @return true if conflicts should not be warned
@@ -2147,34 +2108,16 @@
const LocatorType* locator) const = 0;
virtual void
- error(
- const char* msg,
- const XalanNode* sourceNode,
- const LocatorType* locator) const = 0;
-
- virtual void
warn(
const XalanDOMString& msg,
const XalanNode* sourceNode = 0,
const LocatorType* locator = 0) const = 0;
virtual void
- warn(
- const char* msg,
- const XalanNode* sourceNode = 0,
- const LocatorType* locator = 0) const = 0;
-
- virtual void
message(
const XalanDOMString& msg,
const XalanNode* sourceNode = 0,
const LocatorType* locator = 0) const = 0;
-
- virtual void
- message(
- const char* msg,
- const XalanNode* sourceNode = 0,
- const LocatorType* locator = 0) const = 0;
#if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
protected:
1.30 +0 -68 xml-xalan/c/src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp
Index: StylesheetExecutionContextDefault.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- StylesheetExecutionContextDefault.cpp 31 Jul 2004 05:08:50 -0000 1.29
+++ StylesheetExecutionContextDefault.cpp 13 Aug 2004 15:49:47 -0000 1.30
@@ -2489,29 +2489,6 @@
}
-
-void
-StylesheetExecutionContextDefault::error(
- const char* msg,
- const ElemTemplateElement& styleNode,
- const XalanNode* sourceNode) const
-{
- error(TranscodeFromLocalCodePage(msg), styleNode, sourceNode);
-}
-
-
-
-void
-StylesheetExecutionContextDefault::error(
- const char* msg,
- const XalanNode* sourceNode,
- const LocatorType* locator) const
-{
- error(TranscodeFromLocalCodePage(msg), sourceNode, locator);
-}
-
-
-
void
StylesheetExecutionContextDefault::warn(
const XalanDOMString& msg,
@@ -2556,28 +2533,6 @@
void
-StylesheetExecutionContextDefault::warn(
- const char* msg,
- const ElemTemplateElement& styleNode,
- const XalanNode* sourceNode) const
-{
- warn(TranscodeFromLocalCodePage(msg), styleNode, sourceNode);
-}
-
-
-
-void
-StylesheetExecutionContextDefault::warn(
- const char* msg,
- const XalanNode* sourceNode,
- const LocatorType* locator) const
-{
- warn(TranscodeFromLocalCodePage(msg), sourceNode, locator);
-}
-
-
-
-void
StylesheetExecutionContextDefault::message(
const XalanDOMString& msg,
const ElemTemplateElement& styleNode,
@@ -2617,29 +2572,6 @@
m_xsltProcessor->message(msg, sourceNode);
}
}
-
-
-
-void
-StylesheetExecutionContextDefault::message(
- const char* msg,
- const ElemTemplateElement& styleNode,
- const XalanNode* sourceNode) const
-{
- message(TranscodeFromLocalCodePage(msg), styleNode, sourceNode);
-}
-
-
-
-void
-StylesheetExecutionContextDefault::message(
- const char* msg,
- const XalanNode* sourceNode,
- const LocatorType* locator) const
-{
- message(TranscodeFromLocalCodePage(msg), sourceNode, locator);
-}
-
class PopAndPushContextMarker
1.27 +0 -36 xml-xalan/c/src/xalanc/XSLT/StylesheetExecutionContextDefault.hpp
Index: StylesheetExecutionContextDefault.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/StylesheetExecutionContextDefault.hpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- StylesheetExecutionContextDefault.hpp 31 Jul 2004 06:05:08 -0000 1.26
+++ StylesheetExecutionContextDefault.hpp 13 Aug 2004 15:49:47 -0000 1.27
@@ -209,35 +209,17 @@
const XalanNode* sourceNode = 0) const;
virtual void
- error(
- const char* msg,
- const ElemTemplateElement& styleNode,
- const XalanNode* sourceNode = 0) const;
-
- virtual void
warn(
const XalanDOMString& msg,
const ElemTemplateElement& styleNode,
const XalanNode* sourceNode = 0) const;
virtual void
- warn(
- const char* msg,
- const ElemTemplateElement& styleNode,
- const XalanNode* sourceNode = 0) const;
-
- virtual void
message(
const XalanDOMString& msg,
const ElemTemplateElement& styleNode,
const XalanNode* sourceNode = 0) const;
- virtual void
- message(
- const char* msg,
- const ElemTemplateElement& styleNode,
- const XalanNode* sourceNode = 0) const;
-
virtual bool
getQuietConflictWarnings() const;
@@ -1013,32 +995,14 @@
const LocatorType* locator) const;
virtual void
- error(
- const char* msg,
- const XalanNode* sourceNode,
- const LocatorType* locator) const;
-
- virtual void
warn(
const XalanDOMString& msg,
const XalanNode* sourceNode,
const LocatorType* locator) const;
virtual void
- warn(
- const char* msg,
- const XalanNode* sourceNode,
- const LocatorType* locator) const;
-
- virtual void
message(
const XalanDOMString& msg,
- const XalanNode* sourceNode,
- const LocatorType* locator) const;
-
- virtual void
- message(
- const char* msg,
const XalanNode* sourceNode,
const LocatorType* locator) const;
1.16 +0 -10 xml-xalan/c/src/xalanc/XSLT/StylesheetHandler.cpp
Index: StylesheetHandler.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/StylesheetHandler.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- StylesheetHandler.cpp 19 Apr 2004 14:47:18 -0000 1.15
+++ StylesheetHandler.cpp 13 Aug 2004 15:49:47 -0000 1.16
@@ -1571,16 +1571,6 @@
void
StylesheetHandler::error(
- const char* theMessage,
- const LocatorType* theLocator) const
-{
- m_constructionContext.error(theMessage, 0, theLocator);
-}
-
-
-
-void
-StylesheetHandler::error(
const XalanDOMString& theMessage,
const LocatorType* theLocator) const
{
1.7 +0 -5 xml-xalan/c/src/xalanc/XSLT/StylesheetHandler.hpp
Index: StylesheetHandler.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/StylesheetHandler.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- StylesheetHandler.hpp 31 Jul 2004 06:05:08 -0000 1.6
+++ StylesheetHandler.hpp 13 Aug 2004 15:49:47 -0000 1.7
@@ -408,11 +408,6 @@
// Utility functions...
void
- error(
- const char* theMessage,
- const LocatorType* theLocator) const;
-
- void
illegalAttributeError(
const XalanDOMChar* theElementName,
const XalanDOMChar* theAttributeName,
1.17 +0 -57 xml-xalan/c/src/xalanc/XSLT/XSLTEngineImpl.cpp
Index: XSLTEngineImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/XSLTEngineImpl.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- XSLTEngineImpl.cpp 6 Apr 2004 00:15:36 -0000 1.16
+++ XSLTEngineImpl.cpp 13 Aug 2004 15:49:47 -0000 1.17
@@ -1175,18 +1175,6 @@
}
-
-void
-XSLTEngineImpl::warn(
- const char* msg,
- const XalanNode* sourceNode,
- const ElemTemplateElement* styleNode) const
-{
- warn(TranscodeFromLocalCodePage(msg), sourceNode, styleNode);
-}
-
-
-
void
XSLTEngineImpl::error(
const XalanDOMString& msg,
@@ -3073,51 +3061,6 @@
fireGenerateEvent(ge);
}
-
-
-
-void
-XSLTEngineImpl::error(
- const char* theMessage,
- const LocatorType* theLocator,
- const XalanNode* theSourceNode)
-{
- assert(theMessage != 0);
-
- m_scratchString = theMessage;
-
- if (theLocator != 0)
- {
- error(m_scratchString, *theLocator, theSourceNode);
- }
- else
- {
- error(m_scratchString, theSourceNode);
- }
-}
-
-
-
-void
-XSLTEngineImpl::warn(
- const char* theMessage,
- const LocatorType* theLocator,
- const XalanNode* theSourceNode)
-{
- assert(theMessage != 0);
-
- m_scratchString = theMessage;
-
- if (theLocator != 0)
- {
- warn(m_scratchString, *theLocator, theSourceNode);
- }
- else
- {
- warn(m_scratchString, theSourceNode);
- }
-}
-
void
1.12 +0 -23 xml-xalan/c/src/xalanc/XSLT/XSLTEngineImpl.hpp
Index: XSLTEngineImpl.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/XSLTEngineImpl.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XSLTEngineImpl.hpp 31 Jul 2004 06:05:08 -0000 1.11
+++ XSLTEngineImpl.hpp 13 Aug 2004 15:49:47 -0000 1.12
@@ -800,18 +800,6 @@
const XalanNode* sourceNode = 0,
const ElemTemplateElement* styleNode = 0) const;
- /**
- * Report a message
- *
- * @param msg text of message to output
- * @param sourceNode node in source where error occurred
- * @param styleNode node in stylesheet where error occurred
- */
- virtual void
- warn(
- const char* msg,
- const XalanNode* sourceNode = 0,
- const ElemTemplateElement* styleNode = 0) const;
virtual void
warn(
@@ -1630,17 +1618,6 @@
const XalanDOMString& theElementName,
const XalanDOMString& theElementNamespaceURI);
- void
- error(
- const char* theMessage,
- const LocatorType* theLocator,
- const XalanNode* theSourceNode);
-
- void
- warn(
- const char* theMessage,
- const LocatorType* theLocator,
- const XalanNode* theSourceNode);
// Data members...
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org