Author: aschnell
Date: Wed Jan 7 17:27:21 2009
New Revision: 54454
URL: http://svn.opensuse.org/viewcvs/yast?rev=54454&view=rev
Log:
- tiny cleanup/restructure
Modified:
trunk/core/libycp/src/include/ycp/YCPList.h
trunk/core/libycp/src/include/ycp/YCPMap.h
Modified: trunk/core/libycp/src/include/ycp/YCPList.h
URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/include/ycp/YCPList.h?rev=54454&r1=54453&r2=54454&view=diff
==============================================================================
--- trunk/core/libycp/src/include/ycp/YCPList.h (original)
+++ trunk/core/libycp/src/include/ycp/YCPList.h Wed Jan 7 17:27:21 2009
@@ -12,7 +12,7 @@
File: YCPList.h
- Authors: Mathias Kettner
+ Authors: Mathias Kettner
Arvin Schnell
Maintainer: Thomas Roelz
@@ -43,21 +43,21 @@
*/
class YCPListRep : public YCPValueRep
{
-protected:
+private:
typedef vector<YCPValue> YCPValueList;
+ YCPValueList elements;
+
+protected:
+
typedef YCPValueList::iterator iterator;
typedef YCPValueList::const_iterator const_iterator;
+ typedef YCPValueList::value_type value_type;
+ typedef YCPValueList::const_reference const_reference;
friend class YCPList;
-private:
-
- YCPValueList elements;
-
-protected:
-
/**
* Creates a new and empty list of type [ value ]
*/
@@ -233,11 +233,10 @@
public:
- typedef YCPListRep::YCPValueList::iterator iterator;
- typedef YCPListRep::YCPValueList::const_iterator const_iterator;
-
- typedef YCPListRep::YCPValueList::value_type value_type;
- typedef YCPListRep::YCPValueList::const_reference const_reference;
+ typedef YCPListRep::iterator iterator;
+ typedef YCPListRep::const_iterator const_iterator;
+ typedef YCPListRep::value_type value_type;
+ typedef YCPListRep::const_reference const_reference;
YCPList() : YCPValue(new YCPListRep()) {}
YCPList(bytecodeistream & str);
Modified: trunk/core/libycp/src/include/ycp/YCPMap.h
URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/include/ycp/YCPMap.h?rev=54454&r1=54453&r2=54454&view=diff
==============================================================================
--- trunk/core/libycp/src/include/ycp/YCPMap.h (original)
+++ trunk/core/libycp/src/include/ycp/YCPMap.h Wed Jan 7 17:27:21 2009
@@ -43,19 +43,18 @@
*/
class YCPMapRep : public YCPValueRep
{
+private:
+
+ YCPValueYCPValueMap stl_map;
+
protected:
typedef YCPValueYCPValueMap::iterator iterator;
typedef YCPValueYCPValueMap::const_iterator const_iterator;
+ typedef YCPValueYCPValueMap::value_type value_type;
friend class YCPMap;
-private:
-
- YCPValueYCPValueMap stl_map;
-
-protected:
-
/**
* Creates a new and empty mapping.
*/
@@ -184,10 +183,9 @@
public:
- typedef YCPValueYCPValueMap::iterator iterator;
- typedef YCPValueYCPValueMap::const_iterator const_iterator;
-
- typedef YCPValueYCPValueMap::value_type value_type;
+ typedef YCPMapRep::iterator iterator;
+ typedef YCPMapRep::const_iterator const_iterator;
+ typedef YCPMapRep::value_type value_type;
YCPMap() : YCPValue(new YCPMapRep()) {}
YCPMap(bytecodeistream & str);
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
