Changeset 969 for branches/Carsten_PtrWork/Source/System/Cluster/Window/Base/OSGImageComposerFields.h

Timestamp:

10/05/07 19:12:52 (1 year ago)

Author:

cneumann

Message:

added: typedefs for Parent@!Classname!@Ptr fields
removed: calls to ref counting functions

Still does NOT compile

Files:

• branches/Carsten_PtrWork/Source/System/Cluster/Window/Base/OSGImageComposerFields.h (modified) (7 diffs)

branches/Carsten_PtrWork/Source/System/Cluster/Window/Base/OSGImageComposerFields.h

@@ -58 +58 @@
-#include "OSGClusterDef.h"
-
+#include "OSGParentContainer.h"
-#include "OSGInternalRefPtr.h"
-
@@ -69 +70 @@
-
-class ImageComposer;
+
+OSG_GEN_CONTAINERPTR(ImageComposer);
-
-typedef RefPtr<ImageComposer>         ImageComposerRefPtr;
@@ -76 +79 @@
-typedef InternalRefPtr<ImageComposer> const ImageComposerInternalRefPtrConst;
-typedef InternalRefPtr<ImageComposer> const ImageComposerInternalRefPtrConstArg;
+
+typedef PtrWrapper<ImageComposer,
+                   ImageComposerPtr>        ParentImageComposerPtr;
+typedef PtrWrapper<ImageComposer,
+                   ImageComposerPtr> const  ParentImageComposerPtrConst;
-
-#if !defined(OSG_DO_DOC) // created as a dummy class, remove to prevent doubles
@@ -143 +151 @@
-
-    static const char *getSName(void) { return "SFImageComposerInternalRefPtr"; }
-et
+te
-};
-
@@ -154 +162 @@
-#endif // !defined(OSG_DO_DOC) || (OSG_DOC_LEVEL >= 3)
-
+#if !defined(OSG_DO_DOC) || (OSG_DOC_LEVEL >= 3)
+/*! \ingroup GrpClusterFieldTraits
+ */
+#if !defined(OSG_DOC_DEV_TRAITS)
+/*! \hideinhierarchy */
+#endif
+
+template <>
+struct FieldTraits<ParentImageComposerPtr> :
+    public FieldTraitsFCPtrBase<ParentImageComposerPtr>
+{
+  private:
+
+    static DataType             _type;
+
+  public:
+
+    typedef FieldTraits<ParentImageComposerPtr>  Self;
+
+    enum                        { Convertible = NotConvertible };
+
+    static OSG_CLUSTER_DLLMAPPING DataType &getType(void);
+
+    static const char *getSName(void) { return "SFParentImageComposerPtr"; }
+    static const char *getMName(void) { return "MFParentImageComposerPtr"; }
+};
+
+#if !defined(OSG_DOC_DEV_TRAITS)
+/*! \class  FieldTraitsTemplateBase<ImageComposerPtr, 0>
+    \hideinhierarchy
+ */
+#endif
+
+#endif // !defined(OSG_DO_DOC) || (OSG_DOC_LEVEL >= 3)
+
-#if !defined(OSG_DO_DOC) || defined(OSG_DOC_FIELD_TYPEDEFS)
-/*! \ingroup GrpClusterFieldSingle */
@@ -160 +203 @@
-
-typedef SFieldAdaptor<ImageComposerInternalRefPtr, SFFieldContainerPtr> SFImageComposerInternalRefPtr;
+
+typedef SFieldAdaptor<ParentImageComposerPtr, SFParentFieldContainerPtr> SFParentImageComposerPtr;
-#endif
-
@@ -169 +214 @@
-
-typedef MFieldAdaptor<ImageComposerInternalRefPtr, MFFieldContainerPtr> MFImageComposerInternalRefPtr;
-
-
+
+
+
-
-OSG_END_NAMESPACE