summaryrefslogtreecommitdiff
path: root/l10ntools
diff options
context:
space:
mode:
authorMichael T. Whiteley <mike@whiteley.org>2011-12-07 02:33:51 -0800
committerTor Lillqvist <tlillqvist@suse.com>2011-12-08 11:32:41 +0200
commitdcfd4beb213c551f6ef6ba379651bf303bd9017a (patch)
treea819f50716357c2a5561f6b9a09809cfc52d7dbf /l10ntools
parentad2eb6c4ba3ca36e2302c721a106dac80d266325 (diff)
childs -> children
Diffstat (limited to 'l10ntools')
-rw-r--r--l10ntools/inc/xmlparse.hxx2
-rw-r--r--l10ntools/source/filter/utils/FileHelper.java16
-rw-r--r--l10ntools/source/filter/utils/XMLHelper.java36
-rw-r--r--l10ntools/source/helpmerge.cxx2
-rw-r--r--l10ntools/source/xmlparse.cxx6
5 files changed, 31 insertions, 31 deletions
diff --git a/l10ntools/inc/xmlparse.hxx b/l10ntools/inc/xmlparse.hxx
index 3e9906665226..c333d1e3a62e 100644
--- a/l10ntools/inc/xmlparse.hxx
+++ b/l10ntools/inc/xmlparse.hxx
@@ -174,7 +174,7 @@ public:
virtual int GetPosition( ByteString id );
int RemoveChild( XMLElement *pRefElement );
- void RemoveAndDeleteAllChilds();
+ void RemoveAndDeleteAllChildren();
/// returns a child element which matches the given one
XMLElement *GetChildElement(
diff --git a/l10ntools/source/filter/utils/FileHelper.java b/l10ntools/source/filter/utils/FileHelper.java
index 239711cfbc57..e7e5766a866f 100644
--- a/l10ntools/source/filter/utils/FileHelper.java
+++ b/l10ntools/source/filter/utils/FileHelper.java
@@ -307,22 +307,22 @@ public class FileHelper
if (!aDirectory.isDirectory())
throw new java.io.FileNotFoundException("\""+aDirectory.toString()+"\" is not a directory.");
- java.io.File[] lChilds = aDirectory.listFiles();
- for (int f=0; f<lChilds.length; ++f)
+ java.io.File[] lChildren = aDirectory.listFiles();
+ for (int f=0; f<lChildren.length; ++f)
{
- if (lChilds[f].isDirectory())
+ if (lChildren[f].isDirectory())
{
- FileHelper.makeDirectoryEmpty(lChilds[f], bFilesOnly);
+ FileHelper.makeDirectoryEmpty(lChildren[f], bFilesOnly);
if (!bFilesOnly)
{
- if (!lChilds[f].delete())
- throw new java.io.IOException("\""+lChilds[f].toString()+"\" could not be deleted.");
+ if (!lChildren[f].delete())
+ throw new java.io.IOException("\""+lChildren[f].toString()+"\" could not be deleted.");
}
}
else
{
- if (!lChilds[f].delete())
- throw new java.io.IOException("\""+lChilds[f].toString()+"\" could not be deleted.");
+ if (!lChildren[f].delete())
+ throw new java.io.IOException("\""+lChildren[f].toString()+"\" could not be deleted.");
}
}
}
diff --git a/l10ntools/source/filter/utils/XMLHelper.java b/l10ntools/source/filter/utils/XMLHelper.java
index 175d04ebacef..8ba480d7bf68 100644
--- a/l10ntools/source/filter/utils/XMLHelper.java
+++ b/l10ntools/source/filter/utils/XMLHelper.java
@@ -674,7 +674,7 @@ public class XMLHelper
//___________________________________________
- /** returns a list of childs, which are ELEMENT_NODES and have the right tag name.
+ /** returns a list of children, which are ELEMENT_NODES and have the right tag name.
*
* It analyze the list of all possible child nodes. Only ELEMENT_NODES are candidates.
* All other ones will be ignored. Further these element nodes are compared by it's tag
@@ -695,26 +695,26 @@ public class XMLHelper
{
// extract first all ELEMENT_NODES of he given parent
// Such nodes only provide tag names.
- java.util.Vector lChilds = XMLHelper.extractChildNodesByType(aNode,org.w3c.dom.Node.ELEMENT_NODE);
- java.util.Vector lExtractedChilds = new java.util.Vector(lChilds.size());
+ java.util.Vector lChildren = XMLHelper.extractChildNodesByType(aNode,org.w3c.dom.Node.ELEMENT_NODE);
+ java.util.Vector lExtractedChildren = new java.util.Vector(lChildren.size());
// step over the list and search for the right tags using the specified name
- java.util.Enumeration en = lChilds.elements();
+ java.util.Enumeration en = lChildren.elements();
while (en.hasMoreElements())
{
org.w3c.dom.Node aChild = (org.w3c.dom.Node)en.nextElement();
if (aChild.getNodeName().equals(sTag))
- lExtractedChilds.add(aChild);
+ lExtractedChildren.add(aChild);
}
// pack(!) and return the list
- lExtractedChilds.trimToSize();
- return lExtractedChilds;
+ lExtractedChildren.trimToSize();
+ return lExtractedChildren;
}
//___________________________________________
- /** returns a list of childs, which supports the right node type.
+ /** returns a list of children, which supports the right node type.
*
* It analyze the list of all possible child nodes. If a node represent the right node type
* it is added to the return list. Otherwhise it will be ignored.
@@ -731,23 +731,23 @@ public class XMLHelper
public static java.util.Vector extractChildNodesByType(org.w3c.dom.Node aNode,
short nType)
{
- // get list of all possibe childs and reserve enough space for our return list
- // Attention: A null pointer is not allowed for return! (means lExtractedChilds)
- org.w3c.dom.NodeList lChilds = aNode.getChildNodes();
- int c = lChilds.getLength();
- java.util.Vector lExtractedChilds = new java.util.Vector(c);
+ // get list of all possibe children and reserve enough space for our return list
+ // Attention: A null pointer is not allowed for return! (means lExtractedChildren)
+ org.w3c.dom.NodeList lChildren = aNode.getChildNodes();
+ int c = lChildren.getLength();
+ java.util.Vector lExtractedChildren = new java.util.Vector(c);
- // step of these childs and select only needed ones
+ // step of these children and select only needed ones
for (int i=0; i<c; ++i)
{
- org.w3c.dom.Node aChild = lChilds.item(i);
+ org.w3c.dom.Node aChild = lChildren.item(i);
if (aChild.getNodeType() == nType)
- lExtractedChilds.add(aChild);
+ lExtractedChildren.add(aChild);
}
// pack(!) and return the list
- lExtractedChilds.trimToSize();
- return lExtractedChilds;
+ lExtractedChildren.trimToSize();
+ return lExtractedChildren;
}
//___________________________________________
diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx
index 8447c9c59480..f08310c26d28 100644
--- a/l10ntools/source/helpmerge.cxx
+++ b/l10ntools/source/helpmerge.cxx
@@ -573,7 +573,7 @@ void HelpParser::ProcessHelp( LangHashMap* aLangHM , const ByteString& sCur , Re
if( pXMLElement != NULL )
{
data = new XMLData( sNewdata , NULL , true ); // Add new one
- pXMLElement->RemoveAndDeleteAllChilds();
+ pXMLElement->RemoveAndDeleteAllChildren();
pXMLElement->AddChild( data );
aLangHM->erase( sCur );
}
diff --git a/l10ntools/source/xmlparse.cxx b/l10ntools/source/xmlparse.cxx
index af0bc5234ffd..d8c9ed1b0ba6 100644
--- a/l10ntools/source/xmlparse.cxx
+++ b/l10ntools/source/xmlparse.cxx
@@ -79,7 +79,7 @@ XMLParentNode::~XMLParentNode()
/*****************************************************************************/
{
if( pChildList ){
- RemoveAndDeleteAllChilds();
+ RemoveAndDeleteAllChildren();
delete pChildList;
pChildList = NULL;
}
@@ -117,7 +117,7 @@ XMLParentNode& XMLParentNode::operator=(const XMLParentNode& obj){
if(this!=&obj){
XMLChildNode::operator=(obj);
if( pChildList ){
- RemoveAndDeleteAllChilds();
+ RemoveAndDeleteAllChildren();
delete pChildList;
pChildList = NULL;
}
@@ -227,7 +227,7 @@ int XMLParentNode::RemoveChild( XMLElement *pRefElement )
}
/*****************************************************************************/
-void XMLParentNode::RemoveAndDeleteAllChilds(){
+void XMLParentNode::RemoveAndDeleteAllChildren(){
/*****************************************************************************/
if ( pChildList ) {
for ( size_t i = 0; i < pChildList->size(); i++ )