Menu
▾
▴
[ZooLib-checkins] SF.net SVN: zoolib:[2708] trunk/zoolib/source/cxx
|
From: <ag...@us...> - 2012-02-01 18:51:43
|
Revision: 2708
http://zoolib.svn.sourceforge.net/zoolib/?rev=2708&view=rev
Author: agreen
Date: 2012-02-01 18:51:31 +0000 (Wed, 01 Feb 2012)
Log Message:
-----------
Get rid of last 'bool QGet' methods.
Clean up ZValAccessors.h
Modified Paths:
--------------
trunk/zoolib/source/cxx/more/zoolib/javascriptcore/ZJavaScriptCore.cpp
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_VariantPriv.h
trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_Val.cpp
trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_Val.h
trunk/zoolib/source/cxx/old/zoolib/ZVal_ZooLib.cpp
trunk/zoolib/source/cxx/old/zoolib/ZVal_ZooLib.h
trunk/zoolib/source/cxx/zoolib/ZValAccessors.h
trunk/zoolib/source/cxx/zoolib/ZValAccessors_Std.h
trunk/zoolib/source/cxx/zoolib/ZVal_Any.cpp
trunk/zoolib/source/cxx/zoolib/ZVal_Any.h
trunk/zoolib/source/cxx/zoolib/ZVal_AppleEvent.cpp
trunk/zoolib/source/cxx/zoolib/ZVal_AppleEvent.h
trunk/zoolib/source/cxx/zoolib/ZVal_CF.cpp
trunk/zoolib/source/cxx/zoolib/ZVal_CF.h
trunk/zoolib/source/cxx/zoolib/ZVal_NS.h
trunk/zoolib/source/cxx/zoolib/ZVal_NS.mm
trunk/zoolib/source/cxx/zoolib/ZVal_Yad.cpp
trunk/zoolib/source/cxx/zoolib/ZVal_Yad.h
trunk/zoolib/source/cxx/zoolib/ZWinCOM.cpp
trunk/zoolib/source/cxx/zoolib/ZWinCOM.h
trunk/zoolib/source/cxx/zoolib/ZWinRegistry_Val.cpp
trunk/zoolib/source/cxx/zoolib/ZYad_NS.mm
Modified: trunk/zoolib/source/cxx/more/zoolib/javascriptcore/ZJavaScriptCore.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/javascriptcore/ZJavaScriptCore.cpp 2012-02-01 18:21:01 UTC (rev 2707)
+++ trunk/zoolib/source/cxx/more/zoolib/javascriptcore/ZJavaScriptCore.cpp 2012-02-01 18:51:31 UTC (rev 2708)
@@ -546,10 +546,10 @@
return null;
}
-ZMACRO_ZValAccessors_Def_GetP(,Value, Bool, bool)
-ZMACRO_ZValAccessors_Def_GetP(,Value, Double, double)
-ZMACRO_ZValAccessors_Def_GetP(,Value, String, String)
-ZMACRO_ZValAccessors_Def_GetP(,Value, ObjectRef, ObjectRef)
+ZMACRO_ZValAccessors_Def_Get(Value, Bool, bool)
+ZMACRO_ZValAccessors_Def_Get(Value, Double, double)
+ZMACRO_ZValAccessors_Def_Get(Value, String, String)
+ZMACRO_ZValAccessors_Def_Get(Value, ObjectRef, ObjectRef)
// =================================================================================================
// MARK: - ZJavaScriptCore::ObjectRef
Modified: trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_VariantPriv.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_VariantPriv.h 2012-02-01 18:21:01 UTC (rev 2707)
+++ trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_VariantPriv.h 2012-02-01 18:51:31 UTC (rev 2708)
@@ -365,11 +365,11 @@
// =================================================================================================
// MARK: - NPVariant_T<T> typename accessors
-ZMACRO_ZValAccessors_Def_GetP(template <class T>, NPVariant_T<T>, Bool, bool)
-ZMACRO_ZValAccessors_Def_GetP(template <class T>, NPVariant_T<T>, Int32, int32)
-ZMACRO_ZValAccessors_Def_GetP(template <class T>, NPVariant_T<T>, Double, double)
-ZMACRO_ZValAccessors_Def_GetP(template <class T>, NPVariant_T<T>, String, std::string)
-ZMACRO_ZValAccessors_Def_GetP(template <class T>, NPVariant_T<T>, Object, ZRef<T>)
+ZMACRO_ZValAccessors_Def_GetX(template <class T>, NPVariant_T<T>, Bool, bool)
+ZMACRO_ZValAccessors_Def_GetX(template <class T>, NPVariant_T<T>, Int32, int32)
+ZMACRO_ZValAccessors_Def_GetX(template <class T>, NPVariant_T<T>, Double, double)
+ZMACRO_ZValAccessors_Def_GetX(template <class T>, NPVariant_T<T>, String, std::string)
+ZMACRO_ZValAccessors_Def_GetX(template <class T>, NPVariant_T<T>, Object, ZRef<T>)
} // namespace ZNetscape
} // namespace ZooLib
Modified: trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_Val.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_Val.cpp 2012-02-01 18:21:01 UTC (rev 2707)
+++ trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_Val.cpp 2012-02-01 18:51:31 UTC (rev 2708)
@@ -1078,18 +1078,18 @@
// =================================================================================================
// MARK: - Val typename accessors
-ZMACRO_ZValAccessors_Def_Entry(Val, Int32, int32)
-ZMACRO_ZValAccessors_Def_Entry(Val, Double, double)
-ZMACRO_ZValAccessors_Def_Entry(Val, Bool, bool)
-ZMACRO_ZValAccessors_Def_Entry(Val, String, string8)
-ZMACRO_ZValAccessors_Def_Entry(Val, Data, Data)
-ZMACRO_ZValAccessors_Def_Entry(Val, ClassID, ClassID)
-ZMACRO_ZValAccessors_Def_Entry(Val, UnitFloat, UnitFloat)
-ZMACRO_ZValAccessors_Def_Entry(Val, Enumerated, Enumerated)
-ZMACRO_ZValAccessors_Def_Entry(Val, FileRef, FileRef)
-ZMACRO_ZValAccessors_Def_Entry(Val, Seq, Seq)
-ZMACRO_ZValAccessors_Def_Entry(Val, Map, Map)
-ZMACRO_ZValAccessors_Def_Entry(Val, Spec, Spec)
+ZMACRO_ZValAccessors_Def_GetSet(Val, Int32, int32)
+ZMACRO_ZValAccessors_Def_GetSet(Val, Double, double)
+ZMACRO_ZValAccessors_Def_GetSet(Val, Bool, bool)
+ZMACRO_ZValAccessors_Def_GetSet(Val, String, string8)
+ZMACRO_ZValAccessors_Def_GetSet(Val, Data, Data)
+ZMACRO_ZValAccessors_Def_GetSet(Val, ClassID, ClassID)
+ZMACRO_ZValAccessors_Def_GetSet(Val, UnitFloat, UnitFloat)
+ZMACRO_ZValAccessors_Def_GetSet(Val, Enumerated, Enumerated)
+ZMACRO_ZValAccessors_Def_GetSet(Val, FileRef, FileRef)
+ZMACRO_ZValAccessors_Def_GetSet(Val, Seq, Seq)
+ZMACRO_ZValAccessors_Def_GetSet(Val, Map, Map)
+ZMACRO_ZValAccessors_Def_GetSet(Val, Spec, Spec)
// =================================================================================================
// MARK: - Seq
Modified: trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_Val.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_Val.h 2012-02-01 18:21:01 UTC (rev 2707)
+++ trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_Val.h 2012-02-01 18:51:31 UTC (rev 2708)
@@ -243,18 +243,18 @@
// Typename accessors
/// \cond DoxygenIgnore
- ZMACRO_ZValAccessors_Decl_Entry(Val, Int32, int32)
- ZMACRO_ZValAccessors_Decl_Entry(Val, Double, double)
- ZMACRO_ZValAccessors_Decl_Entry(Val, Bool, bool)
- ZMACRO_ZValAccessors_Decl_Entry(Val, String, string8)
- ZMACRO_ZValAccessors_Decl_Entry(Val, Data, Data)
- ZMACRO_ZValAccessors_Decl_Entry(Val, ClassID, ClassID)
- ZMACRO_ZValAccessors_Decl_Entry(Val, UnitFloat, UnitFloat)
- ZMACRO_ZValAccessors_Decl_Entry(Val, Enumerated, Enumerated)
- ZMACRO_ZValAccessors_Decl_Entry(Val, FileRef, FileRef)
- ZMACRO_ZValAccessors_Decl_Entry(Val, Seq, Seq)
- ZMACRO_ZValAccessors_Decl_Entry(Val, Map, Map)
- ZMACRO_ZValAccessors_Decl_Entry(Val, Spec, Spec)
+ ZMACRO_ZValAccessors_Decl_GetSet(Val, Int32, int32)
+ ZMACRO_ZValAccessors_Decl_GetSet(Val, Double, double)
+ ZMACRO_ZValAccessors_Decl_GetSet(Val, Bool, bool)
+ ZMACRO_ZValAccessors_Decl_GetSet(Val, String, string8)
+ ZMACRO_ZValAccessors_Decl_GetSet(Val, Data, Data)
+ ZMACRO_ZValAccessors_Decl_GetSet(Val, ClassID, ClassID)
+ ZMACRO_ZValAccessors_Decl_GetSet(Val, UnitFloat, UnitFloat)
+ ZMACRO_ZValAccessors_Decl_GetSet(Val, Enumerated, Enumerated)
+ ZMACRO_ZValAccessors_Decl_GetSet(Val, FileRef, FileRef)
+ ZMACRO_ZValAccessors_Decl_GetSet(Val, Seq, Seq)
+ ZMACRO_ZValAccessors_Decl_GetSet(Val, Map, Map)
+ ZMACRO_ZValAccessors_Decl_GetSet(Val, Spec, Spec)
/// \endcond DoxygenIgnore
};
Modified: trunk/zoolib/source/cxx/old/zoolib/ZVal_ZooLib.cpp
===================================================================
--- trunk/zoolib/source/cxx/old/zoolib/ZVal_ZooLib.cpp 2012-02-01 18:21:01 UTC (rev 2707)
+++ trunk/zoolib/source/cxx/old/zoolib/ZVal_ZooLib.cpp 2012-02-01 18:51:31 UTC (rev 2708)
@@ -1265,20 +1265,20 @@
// MARK: - ZVal_ZooLib typename accessors
ZMACRO_ZValAccessors_Def_Std(ZVal_ZooLib)
-ZMACRO_ZValAccessors_Def_Entry(ZVal_ZooLib, ID, uint64)
-ZMACRO_ZValAccessors_Def_Entry(ZVal_ZooLib, Type, ZType)
-ZMACRO_ZValAccessors_Def_Entry(ZVal_ZooLib, Time, ZTime)
-ZMACRO_ZValAccessors_Def_Entry(ZVal_ZooLib, Rect, ZRectPOD)
-ZMACRO_ZValAccessors_Def_Entry(ZVal_ZooLib, Point, ZPointPOD)
-ZMACRO_ZValAccessors_Def_Entry(ZVal_ZooLib, RefCounted, ZRef<ZCounted>)
-ZMACRO_ZValAccessors_Def_Entry(ZVal_ZooLib, Pointer, VoidStar_t)
-ZMACRO_ZValAccessors_Def_Entry(ZVal_ZooLib, Data, ZData_ZooLib)
-ZMACRO_ZValAccessors_Def_Entry(ZVal_ZooLib, Seq, ZSeq_ZooLib)
-ZMACRO_ZValAccessors_Def_Entry(ZVal_ZooLib, Map, ZMap_ZooLib)
+ZMACRO_ZValAccessors_Def_GetSet(ZVal_ZooLib, ID, uint64)
+ZMACRO_ZValAccessors_Def_GetSet(ZVal_ZooLib, Type, ZType)
+ZMACRO_ZValAccessors_Def_GetSet(ZVal_ZooLib, Time, ZTime)
+ZMACRO_ZValAccessors_Def_GetSet(ZVal_ZooLib, Rect, ZRectPOD)
+ZMACRO_ZValAccessors_Def_GetSet(ZVal_ZooLib, Point, ZPointPOD)
+ZMACRO_ZValAccessors_Def_GetSet(ZVal_ZooLib, RefCounted, ZRef<ZCounted>)
+ZMACRO_ZValAccessors_Def_GetSet(ZVal_ZooLib, Pointer, VoidStar_t)
+ZMACRO_ZValAccessors_Def_GetSet(ZVal_ZooLib, Data, ZData_ZooLib)
+ZMACRO_ZValAccessors_Def_GetSet(ZVal_ZooLib, Seq, ZSeq_ZooLib)
+ZMACRO_ZValAccessors_Def_GetSet(ZVal_ZooLib, Map, ZMap_ZooLib)
// Backwards compatibility
-ZMACRO_ZValAccessors_Def_Entry(ZVal_ZooLib, Raw, ZData_ZooLib)
-ZMACRO_ZValAccessors_Def_Entry(ZVal_ZooLib, Tuple, ZMap_ZooLib)
+ZMACRO_ZValAccessors_Def_GetSet(ZVal_ZooLib, Raw, ZData_ZooLib)
+ZMACRO_ZValAccessors_Def_GetSet(ZVal_ZooLib, Tuple, ZMap_ZooLib)
// =================================================================================================
// MARK: - ZVal_ZooLib internal implementation
Modified: trunk/zoolib/source/cxx/old/zoolib/ZVal_ZooLib.h
===================================================================
--- trunk/zoolib/source/cxx/old/zoolib/ZVal_ZooLib.h 2012-02-01 18:21:01 UTC (rev 2707)
+++ trunk/zoolib/source/cxx/old/zoolib/ZVal_ZooLib.h 2012-02-01 18:51:31 UTC (rev 2708)
@@ -195,20 +195,20 @@
// Typename accessors
/// \cond DoxygenIgnore
ZMACRO_ZValAccessors_Decl_Std(ZVal_ZooLib)
- ZMACRO_ZValAccessors_Decl_Entry(ZVal_ZooLib, ID, uint64)
- ZMACRO_ZValAccessors_Decl_Entry(ZVal_ZooLib, Type, ZType)
- ZMACRO_ZValAccessors_Decl_Entry(ZVal_ZooLib, Time, ZTime)
- ZMACRO_ZValAccessors_Decl_Entry(ZVal_ZooLib, Rect, ZRectPOD)
- ZMACRO_ZValAccessors_Decl_Entry(ZVal_ZooLib, Point, ZPointPOD)
- ZMACRO_ZValAccessors_Decl_Entry(ZVal_ZooLib, RefCounted, ZRef<ZCounted>)
- ZMACRO_ZValAccessors_Decl_Entry(ZVal_ZooLib, Pointer, VoidStar_t)
- ZMACRO_ZValAccessors_Decl_Entry(ZVal_ZooLib, Data, ZData_ZooLib)
- ZMACRO_ZValAccessors_Decl_Entry(ZVal_ZooLib, Seq, ZSeq_ZooLib)
- ZMACRO_ZValAccessors_Decl_Entry(ZVal_ZooLib, Map, ZMap_ZooLib)
+ ZMACRO_ZValAccessors_Decl_GetSet(ZVal_ZooLib, ID, uint64)
+ ZMACRO_ZValAccessors_Decl_GetSet(ZVal_ZooLib, Type, ZType)
+ ZMACRO_ZValAccessors_Decl_GetSet(ZVal_ZooLib, Time, ZTime)
+ ZMACRO_ZValAccessors_Decl_GetSet(ZVal_ZooLib, Rect, ZRectPOD)
+ ZMACRO_ZValAccessors_Decl_GetSet(ZVal_ZooLib, Point, ZPointPOD)
+ ZMACRO_ZValAccessors_Decl_GetSet(ZVal_ZooLib, RefCounted, ZRef<ZCounted>)
+ ZMACRO_ZValAccessors_Decl_GetSet(ZVal_ZooLib, Pointer, VoidStar_t)
+ ZMACRO_ZValAccessors_Decl_GetSet(ZVal_ZooLib, Data, ZData_ZooLib)
+ ZMACRO_ZValAccessors_Decl_GetSet(ZVal_ZooLib, Seq, ZSeq_ZooLib)
+ ZMACRO_ZValAccessors_Decl_GetSet(ZVal_ZooLib, Map, ZMap_ZooLib)
// Backwards compatibility
- ZMACRO_ZValAccessors_Decl_Entry(ZVal_ZooLib, Raw, ZData_ZooLib)
- ZMACRO_ZValAccessors_Decl_Entry(ZVal_ZooLib, Tuple, ZMap_ZooLib)
+ ZMACRO_ZValAccessors_Decl_GetSet(ZVal_ZooLib, Raw, ZData_ZooLib)
+ ZMACRO_ZValAccessors_Decl_GetSet(ZVal_ZooLib, Tuple, ZMap_ZooLib)
/// \endcond DoxygenIgnore
private:
Modified: trunk/zoolib/source/cxx/zoolib/ZValAccessors.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZValAccessors.h 2012-02-01 18:21:01 UTC (rev 2707)
+++ trunk/zoolib/source/cxx/zoolib/ZValAccessors.h 2012-02-01 18:51:31 UTC (rev 2708)
@@ -25,36 +25,47 @@
// =================================================================================================
// MARK: - ZMACRO_ZValAccessors
+// Declaration, Get
+
#define ZMACRO_ZValAccessors_Decl_Get(T, TYPENAME, TYPE) \
ZQ<TYPE> QGet##TYPENAME() const; \
- bool QGet##TYPENAME(TYPE& oVal) const; \
TYPE DGet##TYPENAME(const TYPE& iDefault) const; \
TYPE Get##TYPENAME() const; \
-#define ZMACRO_ZValAccessors_Decl_Entry(T, TYPENAME, TYPE) \
+// Declaration, GetSet
+
+#define ZMACRO_ZValAccessors_Decl_GetSet(T, TYPENAME, TYPE) \
ZMACRO_ZValAccessors_Decl_Get(T, TYPENAME, TYPE) \
void Set##TYPENAME(const TYPE& iVal); \
-#define ZMACRO_ZValAccessors_Def_GetP(P, T, TYPENAME, TYPE) \
- P ZQ<TYPE> T::QGet##TYPENAME() const \
+
+// Definition, Get, with leading extra qualification
+
+#define ZMACRO_ZValAccessors_Def_GetX(X, T, TYPENAME, TYPE) \
+ X ZQ<TYPE> T::QGet##TYPENAME() const \
{ return this->QGet<TYPE>(); } \
- P bool T::QGet##TYPENAME(TYPE& oVal) const \
- { \
- if (ZQ<TYPE> theQ = this->QGet<TYPE>()) \
- { oVal = theQ.Get(); return true; } \
- return false; \
- } \
- P TYPE T::DGet##TYPENAME(const TYPE& iDefault) const \
+ X TYPE T::DGet##TYPENAME(const TYPE& iDefault) const \
{ return this->DGet<TYPE>(iDefault); } \
- P TYPE T::Get##TYPENAME() const \
+ X TYPE T::Get##TYPENAME() const \
{ return this->Get<TYPE>(); } \
-#define ZMACRO_ZValAccessors_Def_EntryP(P, T, TYPENAME, TYPE) \
- ZMACRO_ZValAccessors_Def_GetP(P, T, TYPENAME, TYPE) \
- P void T::Set##TYPENAME(const TYPE& iVal) \
+
+// Definition, GetSet, with leading extra qualification
+
+#define ZMACRO_ZValAccessors_Def_GetSetX(X, T, TYPENAME, TYPE) \
+ ZMACRO_ZValAccessors_Def_GetX(X, T, TYPENAME, TYPE) \
+ X void T::Set##TYPENAME(const TYPE& iVal) \
{ return this->Set<TYPE>(iVal); } \
-#define ZMACRO_ZValAccessors_Def_Entry(T, TYPENAME, TYPE) \
- ZMACRO_ZValAccessors_Def_EntryP(,T,TYPENAME, TYPE)
+// Definition, Get
+
+#define ZMACRO_ZValAccessors_Def_Get(T, TYPENAME, TYPE) \
+ ZMACRO_ZValAccessors_Def_GetX(,T,TYPENAME, TYPE)
+
+// Definition, GetSet
+
+#define ZMACRO_ZValAccessors_Def_GetSet(T, TYPENAME, TYPE) \
+ ZMACRO_ZValAccessors_Def_GetSetX(,T,TYPENAME, TYPE)
+
#endif // __ZValAccessors_h__
Modified: trunk/zoolib/source/cxx/zoolib/ZValAccessors_Std.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZValAccessors_Std.h 2012-02-01 18:21:01 UTC (rev 2707)
+++ trunk/zoolib/source/cxx/zoolib/ZValAccessors_Std.h 2012-02-01 18:51:31 UTC (rev 2708)
@@ -31,23 +31,23 @@
// MARK: - ZMACRO_ZValAccessors_Std
#define ZMACRO_ZValAccessors_Decl_Std(T) \
- ZMACRO_ZValAccessors_Decl_Entry(T, Int8, int8) \
- ZMACRO_ZValAccessors_Decl_Entry(T, Int16, int16) \
- ZMACRO_ZValAccessors_Decl_Entry(T, Int32, int32) \
- ZMACRO_ZValAccessors_Decl_Entry(T, Int64, int64) \
- ZMACRO_ZValAccessors_Decl_Entry(T, Bool, bool) \
- ZMACRO_ZValAccessors_Decl_Entry(T, Float, float) \
- ZMACRO_ZValAccessors_Decl_Entry(T, Double, double) \
- ZMACRO_ZValAccessors_Decl_Entry(T, String, std::string) \
+ ZMACRO_ZValAccessors_Decl_GetSet(T, Int8, int8) \
+ ZMACRO_ZValAccessors_Decl_GetSet(T, Int16, int16) \
+ ZMACRO_ZValAccessors_Decl_GetSet(T, Int32, int32) \
+ ZMACRO_ZValAccessors_Decl_GetSet(T, Int64, int64) \
+ ZMACRO_ZValAccessors_Decl_GetSet(T, Bool, bool) \
+ ZMACRO_ZValAccessors_Decl_GetSet(T, Float, float) \
+ ZMACRO_ZValAccessors_Decl_GetSet(T, Double, double) \
+ ZMACRO_ZValAccessors_Decl_GetSet(T, String, std::string) \
#define ZMACRO_ZValAccessors_Def_Std(T) \
- ZMACRO_ZValAccessors_Def_Entry(T, Int8, int8) \
- ZMACRO_ZValAccessors_Def_Entry(T, Int16, int16) \
- ZMACRO_ZValAccessors_Def_Entry(T, Int32, int32) \
- ZMACRO_ZValAccessors_Def_Entry(T, Int64, int64) \
- ZMACRO_ZValAccessors_Def_Entry(T, Bool, bool) \
- ZMACRO_ZValAccessors_Def_Entry(T, Float, float) \
- ZMACRO_ZValAccessors_Def_Entry(T, Double, double) \
- ZMACRO_ZValAccessors_Def_Entry(T, String, std::string) \
+ ZMACRO_ZValAccessors_Def_GetSet(T, Int8, int8) \
+ ZMACRO_ZValAccessors_Def_GetSet(T, Int16, int16) \
+ ZMACRO_ZValAccessors_Def_GetSet(T, Int32, int32) \
+ ZMACRO_ZValAccessors_Def_GetSet(T, Int64, int64) \
+ ZMACRO_ZValAccessors_Def_GetSet(T, Bool, bool) \
+ ZMACRO_ZValAccessors_Def_GetSet(T, Float, float) \
+ ZMACRO_ZValAccessors_Def_GetSet(T, Double, double) \
+ ZMACRO_ZValAccessors_Def_GetSet(T, String, std::string) \
#endif // __ZValAccessors_Std_h__
Modified: trunk/zoolib/source/cxx/zoolib/ZVal_Any.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZVal_Any.cpp 2012-02-01 18:21:01 UTC (rev 2707)
+++ trunk/zoolib/source/cxx/zoolib/ZVal_Any.cpp 2012-02-01 18:51:31 UTC (rev 2708)
@@ -114,9 +114,9 @@
ZVal_Any ZVal_Any::Get(size_t iIndex) const
{ return this->GetSeq().Get(iIndex); }
-ZMACRO_ZValAccessors_Def_Entry(ZVal_Any, Data, ZData_Any)
-ZMACRO_ZValAccessors_Def_Entry(ZVal_Any, Seq, ZSeq_Any)
-ZMACRO_ZValAccessors_Def_Entry(ZVal_Any, Map, ZMap_Any)
+ZMACRO_ZValAccessors_Def_GetSet(ZVal_Any, Data, ZData_Any)
+ZMACRO_ZValAccessors_Def_GetSet(ZVal_Any, Seq, ZSeq_Any)
+ZMACRO_ZValAccessors_Def_GetSet(ZVal_Any, Map, ZMap_Any)
// =================================================================================================
// MARK: - ZSeq_Any::Rep
Modified: trunk/zoolib/source/cxx/zoolib/ZVal_Any.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZVal_Any.h 2012-02-01 18:21:01 UTC (rev 2707)
+++ trunk/zoolib/source/cxx/zoolib/ZVal_Any.h 2012-02-01 18:51:31 UTC (rev 2708)
@@ -215,9 +215,9 @@
// Typename accessors
/// \cond DoxygenIgnore
- ZMACRO_ZValAccessors_Decl_Entry(ZVal_Any, Data, ZData_Any)
- ZMACRO_ZValAccessors_Decl_Entry(ZVal_Any, Seq, ZSeq_Any)
- ZMACRO_ZValAccessors_Decl_Entry(ZVal_Any, Map, ZMap_Any)
+ ZMACRO_ZValAccessors_Decl_GetSet(ZVal_Any, Data, ZData_Any)
+ ZMACRO_ZValAccessors_Decl_GetSet(ZVal_Any, Seq, ZSeq_Any)
+ ZMACRO_ZValAccessors_Decl_GetSet(ZVal_Any, Map, ZMap_Any)
/// \endcond DoxygenIgnore
// If these are free functions then our template constructor will
Modified: trunk/zoolib/source/cxx/zoolib/ZVal_AppleEvent.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZVal_AppleEvent.cpp 2012-02-01 18:21:01 UTC (rev 2707)
+++ trunk/zoolib/source/cxx/zoolib/ZVal_AppleEvent.cpp 2012-02-01 18:51:31 UTC (rev 2708)
@@ -458,19 +458,19 @@
// =================================================================================================
// MARK: - ZVal_AppleEvent typename accessors
-ZMACRO_ZValAccessors_Def_Entry(ZVal_AppleEvent, Int16, int16)
-ZMACRO_ZValAccessors_Def_Entry(ZVal_AppleEvent, Int32, int32)
-ZMACRO_ZValAccessors_Def_Entry(ZVal_AppleEvent, Int64, int64)
-ZMACRO_ZValAccessors_Def_Entry(ZVal_AppleEvent, Bool, bool)
-ZMACRO_ZValAccessors_Def_Entry(ZVal_AppleEvent, Float, float)
-ZMACRO_ZValAccessors_Def_Entry(ZVal_AppleEvent, Double, double)
-ZMACRO_ZValAccessors_Def_Entry(ZVal_AppleEvent, String, std::string)
-ZMACRO_ZValAccessors_Def_Entry(ZVal_AppleEvent, Seq, ZSeq_AppleEvent)
-ZMACRO_ZValAccessors_Def_Entry(ZVal_AppleEvent, Map, ZMap_AppleEvent)
-ZMACRO_ZValAccessors_Def_Entry(ZVal_AppleEvent, FSRef, FSRef)
+ZMACRO_ZValAccessors_Def_GetSet(ZVal_AppleEvent, Int16, int16)
+ZMACRO_ZValAccessors_Def_GetSet(ZVal_AppleEvent, Int32, int32)
+ZMACRO_ZValAccessors_Def_GetSet(ZVal_AppleEvent, Int64, int64)
+ZMACRO_ZValAccessors_Def_GetSet(ZVal_AppleEvent, Bool, bool)
+ZMACRO_ZValAccessors_Def_GetSet(ZVal_AppleEvent, Float, float)
+ZMACRO_ZValAccessors_Def_GetSet(ZVal_AppleEvent, Double, double)
+ZMACRO_ZValAccessors_Def_GetSet(ZVal_AppleEvent, String, std::string)
+ZMACRO_ZValAccessors_Def_GetSet(ZVal_AppleEvent, Seq, ZSeq_AppleEvent)
+ZMACRO_ZValAccessors_Def_GetSet(ZVal_AppleEvent, Map, ZMap_AppleEvent)
+ZMACRO_ZValAccessors_Def_GetSet(ZVal_AppleEvent, FSRef, FSRef)
#if ZCONFIG_SPI_Enabled(Carbon)
- ZMACRO_ZValAccessors_Def_Entry(ZVal_AppleEvent, FSSpec, FSSpec)
+ ZMACRO_ZValAccessors_Def_GetSet(ZVal_AppleEvent, FSSpec, FSSpec)
#endif
// =================================================================================================
Modified: trunk/zoolib/source/cxx/zoolib/ZVal_AppleEvent.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZVal_AppleEvent.h 2012-02-01 18:21:01 UTC (rev 2707)
+++ trunk/zoolib/source/cxx/zoolib/ZVal_AppleEvent.h 2012-02-01 18:51:31 UTC (rev 2708)
@@ -119,19 +119,19 @@
// Typename accessors
/// \cond DoxygenIgnore
- ZMACRO_ZValAccessors_Decl_Entry(ZVal_AppleEvent, Int16, int16)
- ZMACRO_ZValAccessors_Decl_Entry(ZVal_AppleEvent, Int32, int32)
- ZMACRO_ZValAccessors_Decl_Entry(ZVal_AppleEvent, Int64, int64)
- ZMACRO_ZValAccessors_Decl_Entry(ZVal_AppleEvent, Bool, bool)
- ZMACRO_ZValAccessors_Decl_Entry(ZVal_AppleEvent, Float, float)
- ZMACRO_ZValAccessors_Decl_Entry(ZVal_AppleEvent, Double, double)
- ZMACRO_ZValAccessors_Decl_Entry(ZVal_AppleEvent, String, std::string)
- ZMACRO_ZValAccessors_Decl_Entry(ZVal_AppleEvent, Seq, ZSeq_AppleEvent)
- ZMACRO_ZValAccessors_Decl_Entry(ZVal_AppleEvent, Map, ZMap_AppleEvent)
- ZMACRO_ZValAccessors_Decl_Entry(ZVal_AppleEvent, FSRef, FSRef)
+ ZMACRO_ZValAccessors_Decl_GetSet(ZVal_AppleEvent, Int16, int16)
+ ZMACRO_ZValAccessors_Decl_GetSet(ZVal_AppleEvent, Int32, int32)
+ ZMACRO_ZValAccessors_Decl_GetSet(ZVal_AppleEvent, Int64, int64)
+ ZMACRO_ZValAccessors_Decl_GetSet(ZVal_AppleEvent, Bool, bool)
+ ZMACRO_ZValAccessors_Decl_GetSet(ZVal_AppleEvent, Float, float)
+ ZMACRO_ZValAccessors_Decl_GetSet(ZVal_AppleEvent, Double, double)
+ ZMACRO_ZValAccessors_Decl_GetSet(ZVal_AppleEvent, String, std::string)
+ ZMACRO_ZValAccessors_Decl_GetSet(ZVal_AppleEvent, Seq, ZSeq_AppleEvent)
+ ZMACRO_ZValAccessors_Decl_GetSet(ZVal_AppleEvent, Map, ZMap_AppleEvent)
+ ZMACRO_ZValAccessors_Decl_GetSet(ZVal_AppleEvent, FSRef, FSRef)
#if ZCONFIG_SPI_Enabled(Carbon)
- ZMACRO_ZValAccessors_Decl_Entry(ZVal_AppleEvent, FSSpec, FSSpec)
+ ZMACRO_ZValAccessors_Decl_GetSet(ZVal_AppleEvent, FSSpec, FSSpec)
#endif
/// \endcond DoxygenIgnore
};
Modified: trunk/zoolib/source/cxx/zoolib/ZVal_CF.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZVal_CF.cpp 2012-02-01 18:21:01 UTC (rev 2707)
+++ trunk/zoolib/source/cxx/zoolib/ZVal_CF.cpp 2012-02-01 18:51:31 UTC (rev 2708)
@@ -471,10 +471,10 @@
// MARK: - ZVal_CF typename accessors
ZMACRO_ZValAccessors_Def_Std(ZVal_CF)
-ZMACRO_ZValAccessors_Def_Entry(ZVal_CF, CFString, ZRef<CFStringRef>)
-ZMACRO_ZValAccessors_Def_Entry(ZVal_CF, Data, ZData_CF)
-ZMACRO_ZValAccessors_Def_Entry(ZVal_CF, Seq, ZSeq_CF)
-ZMACRO_ZValAccessors_Def_Entry(ZVal_CF, Map, ZMap_CF)
+ZMACRO_ZValAccessors_Def_GetSet(ZVal_CF, CFString, ZRef<CFStringRef>)
+ZMACRO_ZValAccessors_Def_GetSet(ZVal_CF, Data, ZData_CF)
+ZMACRO_ZValAccessors_Def_GetSet(ZVal_CF, Seq, ZSeq_CF)
+ZMACRO_ZValAccessors_Def_GetSet(ZVal_CF, Map, ZMap_CF)
// =================================================================================================
// MARK: - ZSeq_CF
Modified: trunk/zoolib/source/cxx/zoolib/ZVal_CF.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZVal_CF.h 2012-02-01 18:21:01 UTC (rev 2707)
+++ trunk/zoolib/source/cxx/zoolib/ZVal_CF.h 2012-02-01 18:51:31 UTC (rev 2708)
@@ -136,10 +136,10 @@
// Typename accessors
/// \cond DoxygenIgnore
ZMACRO_ZValAccessors_Decl_Std(ZVal_CF)
- ZMACRO_ZValAccessors_Decl_Entry(ZVal_CF, CFString, ZRef<CFStringRef>)
- ZMACRO_ZValAccessors_Decl_Entry(ZVal_CF, Data, ZData_CF)
- ZMACRO_ZValAccessors_Decl_Entry(ZVal_CF, Seq, ZSeq_CF)
- ZMACRO_ZValAccessors_Decl_Entry(ZVal_CF, Map, ZMap_CF)
+ ZMACRO_ZValAccessors_Decl_GetSet(ZVal_CF, CFString, ZRef<CFStringRef>)
+ ZMACRO_ZValAccessors_Decl_GetSet(ZVal_CF, Data, ZData_CF)
+ ZMACRO_ZValAccessors_Decl_GetSet(ZVal_CF, Seq, ZSeq_CF)
+ ZMACRO_ZValAccessors_Decl_GetSet(ZVal_CF, Map, ZMap_CF)
/// \endcond DoxygenIgnore
};
Modified: trunk/zoolib/source/cxx/zoolib/ZVal_NS.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZVal_NS.h 2012-02-01 18:21:01 UTC (rev 2707)
+++ trunk/zoolib/source/cxx/zoolib/ZVal_NS.h 2012-02-01 18:51:31 UTC (rev 2708)
@@ -149,10 +149,10 @@
typedef NSString* NSStringPtr;
ZMACRO_ZValAccessors_Decl_Std(ZVal_NS)
- ZMACRO_ZValAccessors_Decl_Entry(ZVal_NS, NSString, NSStringPtr)
- ZMACRO_ZValAccessors_Decl_Entry(ZVal_NS, Data, ZData_NS)
- ZMACRO_ZValAccessors_Decl_Entry(ZVal_NS, Seq, ZSeq_NS)
- ZMACRO_ZValAccessors_Decl_Entry(ZVal_NS, Map, ZMap_NS)
+ ZMACRO_ZValAccessors_Decl_GetSet(ZVal_NS, NSString, NSStringPtr)
+ ZMACRO_ZValAccessors_Decl_GetSet(ZVal_NS, Data, ZData_NS)
+ ZMACRO_ZValAccessors_Decl_GetSet(ZVal_NS, Seq, ZSeq_NS)
+ ZMACRO_ZValAccessors_Decl_GetSet(ZVal_NS, Map, ZMap_NS)
/// \endcond DoxygenIgnore
};
Modified: trunk/zoolib/source/cxx/zoolib/ZVal_NS.mm
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZVal_NS.mm 2012-02-01 18:21:01 UTC (rev 2707)
+++ trunk/zoolib/source/cxx/zoolib/ZVal_NS.mm 2012-02-01 18:51:31 UTC (rev 2708)
@@ -384,10 +384,10 @@
// MARK: - ZVal_NS typename accessors
ZMACRO_ZValAccessors_Def_Std(ZVal_NS)
-ZMACRO_ZValAccessors_Def_Entry(ZVal_NS, NSString, ZVal_NS::NSStringPtr)
-ZMACRO_ZValAccessors_Def_Entry(ZVal_NS, Data, ZData_NS)
-ZMACRO_ZValAccessors_Def_Entry(ZVal_NS, Seq, ZSeq_NS)
-ZMACRO_ZValAccessors_Def_Entry(ZVal_NS, Map, ZMap_NS)
+ZMACRO_ZValAccessors_Def_GetSet(ZVal_NS, NSString, ZVal_NS::NSStringPtr)
+ZMACRO_ZValAccessors_Def_GetSet(ZVal_NS, Data, ZData_NS)
+ZMACRO_ZValAccessors_Def_GetSet(ZVal_NS, Seq, ZSeq_NS)
+ZMACRO_ZValAccessors_Def_GetSet(ZVal_NS, Map, ZMap_NS)
// =================================================================================================
// MARK: - ZSeq_NS
Modified: trunk/zoolib/source/cxx/zoolib/ZVal_Yad.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZVal_Yad.cpp 2012-02-01 18:21:01 UTC (rev 2707)
+++ trunk/zoolib/source/cxx/zoolib/ZVal_Yad.cpp 2012-02-01 18:51:31 UTC (rev 2708)
@@ -132,8 +132,8 @@
return ZAny();
}
-ZMACRO_ZValAccessors_Def_GetP(,ZVal_Yad, Seq, ZSeq_Yad)
-ZMACRO_ZValAccessors_Def_GetP(,ZVal_Yad, Map, ZMap_Yad)
+ZMACRO_ZValAccessors_Def_Get(ZVal_Yad, Seq, ZSeq_Yad)
+ZMACRO_ZValAccessors_Def_Get(ZVal_Yad, Map, ZMap_Yad)
// =================================================================================================
// MARK: - ZSeq_Yad
Modified: trunk/zoolib/source/cxx/zoolib/ZVal_Yad.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZVal_Yad.h 2012-02-01 18:21:01 UTC (rev 2707)
+++ trunk/zoolib/source/cxx/zoolib/ZVal_Yad.h 2012-02-01 18:51:31 UTC (rev 2708)
@@ -105,8 +105,8 @@
// Typename accessors
/// \cond DoxygenIgnore
- ZMACRO_ZValAccessors_Decl_Entry(ZVal_Yad, Seq, ZSeq_Yad)
- ZMACRO_ZValAccessors_Decl_Entry(ZVal_Yad, Map, ZMap_Yad)
+ ZMACRO_ZValAccessors_Decl_GetSet(ZVal_Yad, Seq, ZSeq_Yad)
+ ZMACRO_ZValAccessors_Decl_GetSet(ZVal_Yad, Map, ZMap_Yad)
/// \endcond DoxygenIgnore
// Our protocol
Modified: trunk/zoolib/source/cxx/zoolib/ZWinCOM.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZWinCOM.cpp 2012-02-01 18:21:01 UTC (rev 2707)
+++ trunk/zoolib/source/cxx/zoolib/ZWinCOM.cpp 2012-02-01 18:51:31 UTC (rev 2708)
@@ -433,22 +433,22 @@
}
/// \cond DoxygenIgnore
-ZMACRO_ZValAccessors_Def_Entry(Variant, Int8, int8)
-ZMACRO_ZValAccessors_Def_Entry(Variant, UInt, uint8)
-ZMACRO_ZValAccessors_Def_Entry(Variant, Int16, int16)
-ZMACRO_ZValAccessors_Def_Entry(Variant, UInt16, uint16)
-ZMACRO_ZValAccessors_Def_Entry(Variant, Int32, int32)
-ZMACRO_ZValAccessors_Def_Entry(Variant, UInt32, uint32)
-ZMACRO_ZValAccessors_Def_Entry(Variant, Int64, int64)
-ZMACRO_ZValAccessors_Def_Entry(Variant, UInt64, uint64)
-ZMACRO_ZValAccessors_Def_Entry(Variant, Bool, bool)
-ZMACRO_ZValAccessors_Def_Entry(Variant, Float, float)
-ZMACRO_ZValAccessors_Def_Entry(Variant, Double, double)
-ZMACRO_ZValAccessors_Def_Entry(Variant, String, string8)
-ZMACRO_ZValAccessors_Def_Entry(Variant, String8, string8)
-ZMACRO_ZValAccessors_Def_Entry(Variant, String16, string16)
-ZMACRO_ZValAccessors_Def_Entry(Variant, Unknown, ZRef<IUnknown>)
-ZMACRO_ZValAccessors_Def_Entry(Variant, Dispatch, ZRef<IDispatch>)
+ZMACRO_ZValAccessors_Def_GetSet(Variant, Int8, int8)
+ZMACRO_ZValAccessors_Def_GetSet(Variant, UInt, uint8)
+ZMACRO_ZValAccessors_Def_GetSet(Variant, Int16, int16)
+ZMACRO_ZValAccessors_Def_GetSet(Variant, UInt16, uint16)
+ZMACRO_ZValAccessors_Def_GetSet(Variant, Int32, int32)
+ZMACRO_ZValAccessors_Def_GetSet(Variant, UInt32, uint32)
+ZMACRO_ZValAccessors_Def_GetSet(Variant, Int64, int64)
+ZMACRO_ZValAccessors_Def_GetSet(Variant, UInt64, uint64)
+ZMACRO_ZValAccessors_Def_GetSet(Variant, Bool, bool)
+ZMACRO_ZValAccessors_Def_GetSet(Variant, Float, float)
+ZMACRO_ZValAccessors_Def_GetSet(Variant, Double, double)
+ZMACRO_ZValAccessors_Def_GetSet(Variant, String, string8)
+ZMACRO_ZValAccessors_Def_GetSet(Variant, String8, string8)
+ZMACRO_ZValAccessors_Def_GetSet(Variant, String16, string16)
+ZMACRO_ZValAccessors_Def_GetSet(Variant, Unknown, ZRef<IUnknown>)
+ZMACRO_ZValAccessors_Def_GetSet(Variant, Dispatch, ZRef<IDispatch>)
/// \endcond DoxygenIgnore
// =================================================================================================
Modified: trunk/zoolib/source/cxx/zoolib/ZWinCOM.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZWinCOM.h 2012-02-01 18:21:01 UTC (rev 2707)
+++ trunk/zoolib/source/cxx/zoolib/ZWinCOM.h 2012-02-01 18:51:31 UTC (rev 2708)
@@ -306,22 +306,22 @@
// Typename accessors
/// \cond DoxygenIgnore
- ZMACRO_ZValAccessors_Decl_Entry(Variant, Int8, int8)
- ZMACRO_ZValAccessors_Decl_Entry(Variant, UInt, uint8)
- ZMACRO_ZValAccessors_Decl_Entry(Variant, Int16, int16)
- ZMACRO_ZValAccessors_Decl_Entry(Variant, UInt16, uint16)
- ZMACRO_ZValAccessors_Decl_Entry(Variant, Int32, int32)
- ZMACRO_ZValAccessors_Decl_Entry(Variant, UInt32, uint32)
- ZMACRO_ZValAccessors_Decl_Entry(Variant, Int64, int64)
- ZMACRO_ZValAccessors_Decl_Entry(Variant, UInt64, uint64)
- ZMACRO_ZValAccessors_Decl_Entry(Variant, Bool, bool)
- ZMACRO_ZValAccessors_Decl_Entry(Variant, Float, float)
- ZMACRO_ZValAccessors_Decl_Entry(Variant, Double, double)
- ZMACRO_ZValAccessors_Decl_Entry(Variant, String, string8)
- ZMACRO_ZValAccessors_Decl_Entry(Variant, String8, string8)
- ZMACRO_ZValAccessors_Decl_Entry(Variant, String16, string16)
- ZMACRO_ZValAccessors_Decl_Entry(Variant, Unknown, ZRef<IUnknown>)
- ZMACRO_ZValAccessors_Decl_Entry(Variant, Dispatch, ZRef<IDispatch>)
+ ZMACRO_ZValAccessors_Decl_GetSet(Variant, Int8, int8)
+ ZMACRO_ZValAccessors_Decl_GetSet(Variant, UInt, uint8)
+ ZMACRO_ZValAccessors_Decl_GetSet(Variant, Int16, int16)
+ ZMACRO_ZValAccessors_Decl_GetSet(Variant, UInt16, uint16)
+ ZMACRO_ZValAccessors_Decl_GetSet(Variant, Int32, int32)
+ ZMACRO_ZValAccessors_Decl_GetSet(Variant, UInt32, uint32)
+ ZMACRO_ZValAccessors_Decl_GetSet(Variant, Int64, int64)
+ ZMACRO_ZValAccessors_Decl_GetSet(Variant, UInt64, uint64)
+ ZMACRO_ZValAccessors_Decl_GetSet(Variant, Bool, bool)
+ ZMACRO_ZValAccessors_Decl_GetSet(Variant, Float, float)
+ ZMACRO_ZValAccessors_Decl_GetSet(Variant, Double, double)
+ ZMACRO_ZValAccessors_Decl_GetSet(Variant, String, string8)
+ ZMACRO_ZValAccessors_Decl_GetSet(Variant, String8, string8)
+ ZMACRO_ZValAccessors_Decl_GetSet(Variant, String16, string16)
+ ZMACRO_ZValAccessors_Decl_GetSet(Variant, Unknown, ZRef<IUnknown>)
+ ZMACRO_ZValAccessors_Decl_GetSet(Variant, Dispatch, ZRef<IDispatch>)
/// \endcond DoxygenIgnore
};
Modified: trunk/zoolib/source/cxx/zoolib/ZWinRegistry_Val.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZWinRegistry_Val.cpp 2012-02-01 18:21:01 UTC (rev 2707)
+++ trunk/zoolib/source/cxx/zoolib/ZWinRegistry_Val.cpp 2012-02-01 18:51:31 UTC (rev 2708)
@@ -263,14 +263,14 @@
return Val();
}
-ZMACRO_ZValAccessors_Def_GetP(,Val, String16, string16)
-ZMACRO_ZValAccessors_Def_GetP(,Val, StringList, vector<string16>)
-ZMACRO_ZValAccessors_Def_GetP(,Val, String_Env, String_Env)
-ZMACRO_ZValAccessors_Def_GetP(,Val, String_Link, String_Link)
-ZMACRO_ZValAccessors_Def_GetP(,Val, Int32, int32)
-ZMACRO_ZValAccessors_Def_GetP(,Val, Int64, int64)
-ZMACRO_ZValAccessors_Def_GetP(,Val, Data, Data)
-ZMACRO_ZValAccessors_Def_GetP(,Val, KeyRef, KeyRef)
+ZMACRO_ZValAccessors_Def_Get(Val, String16, string16)
+ZMACRO_ZValAccessors_Def_Get(Val, StringList, vector<string16>)
+ZMACRO_ZValAccessors_Def_Get(Val, String_Env, String_Env)
+ZMACRO_ZValAccessors_Def_Get(Val, String_Link, String_Link)
+ZMACRO_ZValAccessors_Def_Get(Val, Int32, int32)
+ZMACRO_ZValAccessors_Def_Get(Val, Int64, int64)
+ZMACRO_ZValAccessors_Def_Get(Val, Data, Data)
+ZMACRO_ZValAccessors_Def_Get(Val, KeyRef, KeyRef)
// =================================================================================================
// MARK: - ZWinRegistry::KeyRef
Modified: trunk/zoolib/source/cxx/zoolib/ZYad_NS.mm
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZYad_NS.mm 2012-02-01 18:21:01 UTC (rev 2707)
+++ trunk/zoolib/source/cxx/zoolib/ZYad_NS.mm 2012-02-01 18:51:31 UTC (rev 2708)
@@ -129,21 +129,17 @@
{
const ZVal_NS theVal = iVal;
- ZMap_NS asMap;
- if (theVal.QGetMap(asMap))
- return new ZYadMapRPos_NS(asMap);
+ if (ZQ<ZMap_NS> theQ = theVal.QGetMap())
+ return new ZYadMapRPos_NS(*theQ);
- ZSeq_NS asSeq;
- if (theVal.QGetSeq(asSeq))
- return new ZYadSeqRPos_NS(asSeq);
+ if (ZQ<ZSeq_NS> theQ = theVal.QGetSeq())
+ return new ZYadSeqRPos_NS(*theQ);
- ZData_NS asData;
- if (theVal.QGetData(asData))
- return new ZYadStreamRPos_NS(asData);
+ if (ZQ<ZData_NS> theQ = theVal.QGetData())
+ return new ZYadStreamRPos_NS(*theQ);
- NSString* asNSString;
- if (theVal.QGetNSString(asNSString))
- return new ZYadStrimR_NS(asNSString);
+ if (ZQ<NSString*> theQ = theVal.QGetNSString())
+ return new ZYadStrimR_NS(*theQ);
return new ZYadAtomR_NS(iVal);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
