| -rw-r--r-- | libopie/xmltree.cc | 70 | ||||
| -rw-r--r-- | libopie2/opiecore/xmltree.cc | 70 |
2 files changed, 72 insertions, 68 deletions
diff --git a/libopie/xmltree.cc b/libopie/xmltree.cc index 9b8dd05..bf93151 100644 --- a/libopie/xmltree.cc +++ b/libopie/xmltree.cc @@ -3,20 +3,16 @@ - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - As a special exception this program may be linked with Qt non-commercial - edition, the resulting executable be distributed, without including the - source code for the Qt non-commercial edition in the source distribution. - + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ @@ -30,2 +26,24 @@ +namespace +{ + +/** + Encode an attribute value upon saving. + replaces '"' with """ + replaces '<' with "<" + replaces '&' with "&" + replaces '>' with ">" +*/ +QString encodeAttr( const QString& str ) +{ + QString encAttr( str ); // cause of the const parameter + encAttr = encAttr.replace( QRegExp( "[<]" ), "<" ); + encAttr = encAttr.replace( QRegExp( "[>]" ), ">" ); + encAttr = encAttr.replace( QRegExp( "[\"]" ), """ ); + encAttr = encAttr.replace( QRegExp( "[&]" ), "&" ); + return encAttr; +} + +} + XMLElement::XMLElement() @@ -196,18 +214,2 @@ void XMLElement::save( QTextStream &s, uint indent ) } -/** - Encode an attribute value upon saving. - replaces '"' with """ - replaces '<' with "<" - replaces '&' with "&" - replaces '>' with ">" -*/ -QString XMLElement::encodeAttr( const QString& str ) -{ - QString encAttr( str ); // cause of the const parameter - encAttr = encAttr.replace( QRegExp( "[<]" ), "<" ); - encAttr = encAttr.replace( QRegExp( "[>]" ), ">" ); - encAttr = encAttr.replace( QRegExp( "[\"]" ), """ ); - encAttr = encAttr.replace( QRegExp( "[&]" ), "&" ); - return encAttr; -} diff --git a/libopie2/opiecore/xmltree.cc b/libopie2/opiecore/xmltree.cc index 9b8dd05..bf93151 100644 --- a/libopie2/opiecore/xmltree.cc +++ b/libopie2/opiecore/xmltree.cc @@ -3,20 +3,16 @@ - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - As a special exception this program may be linked with Qt non-commercial - edition, the resulting executable be distributed, without including the - source code for the Qt non-commercial edition in the source distribution. - + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ @@ -30,2 +26,24 @@ +namespace +{ + +/** + Encode an attribute value upon saving. + replaces '"' with """ + replaces '<' with "<" + replaces '&' with "&" + replaces '>' with ">" +*/ +QString encodeAttr( const QString& str ) +{ + QString encAttr( str ); // cause of the const parameter + encAttr = encAttr.replace( QRegExp( "[<]" ), "<" ); + encAttr = encAttr.replace( QRegExp( "[>]" ), ">" ); + encAttr = encAttr.replace( QRegExp( "[\"]" ), """ ); + encAttr = encAttr.replace( QRegExp( "[&]" ), "&" ); + return encAttr; +} + +} + XMLElement::XMLElement() @@ -196,18 +214,2 @@ void XMLElement::save( QTextStream &s, uint indent ) } -/** - Encode an attribute value upon saving. - replaces '"' with """ - replaces '<' with "<" - replaces '&' with "&" - replaces '>' with ">" -*/ -QString XMLElement::encodeAttr( const QString& str ) -{ - QString encAttr( str ); // cause of the const parameter - encAttr = encAttr.replace( QRegExp( "[<]" ), "<" ); - encAttr = encAttr.replace( QRegExp( "[>]" ), ">" ); - encAttr = encAttr.replace( QRegExp( "[\"]" ), """ ); - encAttr = encAttr.replace( QRegExp( "[&]" ), "&" ); - return encAttr; -} |