summaryrefslogtreecommitdiff
authorsimon <simon>2002-03-14 16:50:51 (UTC)
committer simon <simon>2002-03-14 16:50:51 (UTC)
commit5283a32d6d9ab9b9bccd3482ab6694c940c874d3 (patch) (side-by-side diff)
tree3b0e49a60c460a7627d4d328ed0086e5830896db
parentab6f5e5cdae5eacf6e1fc2434a7d2981c71cb408 (diff)
downloadopie-5283a32d6d9ab9b9bccd3482ab6694c940c874d3.zip
opie-5283a32d6d9ab9b9bccd3482ab6694c940c874d3.tar.gz
opie-5283a32d6d9ab9b9bccd3482ab6694c940c874d3.tar.bz2
- moved encodeAttr out of XMLElement into an anonymous namespace
- private copy ctor and assignment operator - changed license to LGPL
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--libopie/xmltree.cc64
-rw-r--r--libopie2/opiecore/xmltree.cc64
2 files changed, 66 insertions, 62 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 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 program is distributed in the hope that it will be useful,
+ 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 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.
+ 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 "&quot"
+ replaces '<' with "&lt"
+ replaces '&' with "&amp"
+ replaces '>' with "&gt"
+*/
+QString encodeAttr( const QString& str )
+{
+ QString encAttr( str ); // cause of the const parameter
+ encAttr = encAttr.replace( QRegExp( "[<]" ), "&lt" );
+ encAttr = encAttr.replace( QRegExp( "[>]" ), "&gt" );
+ encAttr = encAttr.replace( QRegExp( "[\"]" ), "&quot" );
+ encAttr = encAttr.replace( QRegExp( "[&]" ), "&amp" );
+ return encAttr;
+}
+
+}
+
XMLElement::XMLElement()
@@ -196,18 +214,2 @@ void XMLElement::save( QTextStream &s, uint indent )
}
-/**
- Encode an attribute value upon saving.
- replaces '"' with "&quot"
- replaces '<' with "&lt"
- replaces '&' with "&amp"
- replaces '>' with "&gt"
-*/
-QString XMLElement::encodeAttr( const QString& str )
-{
- QString encAttr( str ); // cause of the const parameter
- encAttr = encAttr.replace( QRegExp( "[<]" ), "&lt" );
- encAttr = encAttr.replace( QRegExp( "[>]" ), "&gt" );
- encAttr = encAttr.replace( QRegExp( "[\"]" ), "&quot" );
- encAttr = encAttr.replace( QRegExp( "[&]" ), "&amp" );
- 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 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 program is distributed in the hope that it will be useful,
+ 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 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.
+ 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 "&quot"
+ replaces '<' with "&lt"
+ replaces '&' with "&amp"
+ replaces '>' with "&gt"
+*/
+QString encodeAttr( const QString& str )
+{
+ QString encAttr( str ); // cause of the const parameter
+ encAttr = encAttr.replace( QRegExp( "[<]" ), "&lt" );
+ encAttr = encAttr.replace( QRegExp( "[>]" ), "&gt" );
+ encAttr = encAttr.replace( QRegExp( "[\"]" ), "&quot" );
+ encAttr = encAttr.replace( QRegExp( "[&]" ), "&amp" );
+ return encAttr;
+}
+
+}
+
XMLElement::XMLElement()
@@ -196,18 +214,2 @@ void XMLElement::save( QTextStream &s, uint indent )
}
-/**
- Encode an attribute value upon saving.
- replaces '"' with "&quot"
- replaces '<' with "&lt"
- replaces '&' with "&amp"
- replaces '>' with "&gt"
-*/
-QString XMLElement::encodeAttr( const QString& str )
-{
- QString encAttr( str ); // cause of the const parameter
- encAttr = encAttr.replace( QRegExp( "[<]" ), "&lt" );
- encAttr = encAttr.replace( QRegExp( "[>]" ), "&gt" );
- encAttr = encAttr.replace( QRegExp( "[\"]" ), "&quot" );
- encAttr = encAttr.replace( QRegExp( "[&]" ), "&amp" );
- return encAttr;
-}