Changeset 369

Timestamp:

Jun 22, 2008, 9:46:20 PM (17 years ago)

Author:

cinc

Message:

Renamed nomGetCreatedClassName() to nomQueryCreatedClassName() because there is no copy returned. Added Test case class for NOMClassMgr to XCode project.

Location:

trunk

Files:

• nom.xcodeproj/project.pbxproj (modified) (7 diffs)
• nom/class_c/nomcls.c (modified) (1 diff)
• nom/idl/nomcls.idl (modified) (1 diff)
• nom/src/nomdebug.c (modified) (1 diff)
• tests/class_c/testnomclassmgr.c (modified) (1 diff)

trunk/nom.xcodeproj/project.pbxproj

@@ -21 +21 @@
                 36C523D40DFC380300B71A79 /* test-nom.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "test-nom.c"; sourceTree = "<group>"; };
                 36C523D50DFC380300B71A79 /* test-nom-2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "test-nom-2.c"; sourceTree = "<group>"; };
-                36C523D70DFC380300B71A79 /* aclass.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = aclass.idl; sourceTree = "<group>"; };
-                36C523D80DFC380300B71A79 /* bclass.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = bclass.idl; sourceTree = "<group>"; };
+                36C523D70DFC380300B71A79 /* aclass.idl */ = {isa = PBXFileReference; explicitFileType = sourcecode.c; fileEncoding = 4; path = aclass.idl; sourceTree = "<group>"; };
+                36C523D80DFC380300B71A79 /* bclass.idl */ = {isa = PBXFileReference; explicitFileType = sourcecode.c; fileEncoding = 4; path = bclass.idl; sourceTree = "<group>"; };
                 36C523DA0DFC386A00B71A79 /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
                 36C523DB0DFC386A00B71A79 /* Makefile.kmk */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.kmk; sourceTree = "<group>"; };
@@ -64 +64 @@
                 36C5240E0DFC389F00B71A79 /* nombase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nombase.h; sourceTree = "<group>"; };
                 36C5240F0DFC389F00B71A79 /* make.inc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; path = make.inc; sourceTree = "<group>"; };
-                36C524120DFC389F00B71A79 /* nomarray.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = nomarray.idl; sourceTree = "<group>"; };
-                36C524130DFC389F00B71A79 /* nomtestcase.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = nomtestcase.idl; sourceTree = "<group>"; };
-                36C524140DFC389F00B71A79 /* nomstring.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = nomstring.idl; sourceTree = "<group>"; };
-                36C524150DFC389F00B71A79 /* nomcls.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = nomcls.idl; sourceTree = "<group>"; };
-                36C524160DFC389F00B71A79 /* nomtestresult.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = nomtestresult.idl; sourceTree = "<group>"; };
-                36C524170DFC389F00B71A79 /* nomclassmanager.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = nomclassmanager.idl; sourceTree = "<group>"; };
-                36C524180DFC389F00B71A79 /* nombase.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = nombase.idl; sourceTree = "<group>"; };
-                36C524190DFC389F00B71A79 /* nommethod.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = nommethod.idl; sourceTree = "<group>"; };
-                36C5241A0DFC389F00B71A79 /* nomobj.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = nomobj.idl; sourceTree = "<group>"; };
+                36C524120DFC389F00B71A79 /* nomarray.idl */ = {isa = PBXFileReference; explicitFileType = sourcecode.c; fileEncoding = 4; path = nomarray.idl; sourceTree = "<group>"; };
+                36C524130DFC389F00B71A79 /* nomtestcase.idl */ = {isa = PBXFileReference; explicitFileType = sourcecode.c; fileEncoding = 4; path = nomtestcase.idl; sourceTree = "<group>"; };
+                36C524140DFC389F00B71A79 /* nomstring.idl */ = {isa = PBXFileReference; explicitFileType = sourcecode.c; fileEncoding = 4; path = nomstring.idl; sourceTree = "<group>"; };
+                36C524150DFC389F00B71A79 /* nomcls.idl */ = {isa = PBXFileReference; explicitFileType = sourcecode.c; fileEncoding = 4; path = nomcls.idl; sourceTree = "<group>"; };
+                36C524160DFC389F00B71A79 /* nomtestresult.idl */ = {isa = PBXFileReference; explicitFileType = sourcecode.c; fileEncoding = 4; path = nomtestresult.idl; sourceTree = "<group>"; };
+                36C524170DFC389F00B71A79 /* nomclassmanager.idl */ = {isa = PBXFileReference; explicitFileType = sourcecode.c; fileEncoding = 4; path = nomclassmanager.idl; sourceTree = "<group>"; };
+                36C524180DFC389F00B71A79 /* nombase.idl */ = {isa = PBXFileReference; explicitFileType = sourcecode.c; fileEncoding = 4; path = nombase.idl; sourceTree = "<group>"; };
+                36C524190DFC389F00B71A79 /* nommethod.idl */ = {isa = PBXFileReference; explicitFileType = sourcecode.c; fileEncoding = 4; path = nommethod.idl; sourceTree = "<group>"; };
+                36C5241A0DFC389F00B71A79 /* nomobj.idl */ = {isa = PBXFileReference; explicitFileType = sourcecode.c; fileEncoding = 4; path = nomobj.idl; sourceTree = "<group>"; };
                 36C5241C0DFC389F00B71A79 /* nomtestresult.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = nomtestresult.c; sourceTree = "<group>"; };
                 36C5241D0DFC389F00B71A79 /* nommethod.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = nommethod.c; sourceTree = "<group>"; };
@@ -92 +92 @@
                 36C5242F0DFC389F00B71A79 /* nombuildnomcls.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = nombuildnomcls.c; sourceTree = "<group>"; };
                 36C524300DFC389F00B71A79 /* nomtkinit.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = nomtkinit.c; sourceTree = "<group>"; };
-                36C524310DFC389F00B71A79 /* _nomgc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = _nomgc.c; sourceTree = "<group>"; };
                 36C524320DFC389F00B71A79 /* thunk.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = thunk.c; sourceTree = "<group>"; };
                 36C524330DFC389F00B71A79 /* nomid.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = nomid.c; sourceTree = "<group>"; };
@@ -101 +100 @@
                 36C524380DFC389F00B71A79 /* Makefile.kmk */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.kmk; sourceTree = "<group>"; };
                 36C524390DFC389F00B71A79 /* exports.def */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = exports.def; sourceTree = "<group>"; };
+                36C5245A0DFC512E00B71A79 /* testnomobject.idl */ = {isa = PBXFileReference; explicitFileType = sourcecode.c; fileEncoding = 4; path = testnomobject.idl; sourceTree = "<group>"; };
+                36C5248D0DFC55CA00B71A79 /* testnomobject.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = testnomobject.c; sourceTree = "<group>"; };
+                36C780090E0ED8F800B897F3 /* testnomclassmgr.idl */ = {isa = PBXFileReference; explicitFileType = sourcecode.c; fileEncoding = 4; path = testnomclassmgr.idl; sourceTree = "<group>"; };
+                36C7800D0E0EDB5D00B897F3 /* testnomclassmgr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = testnomclassmgr.c; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -130 +133 @@
                         isa = PBXGroup;
                         children = (
+                                36C7800D0E0EDB5D00B897F3 /* testnomclassmgr.c */,
+                                36C5248D0DFC55CA00B71A79 /* testnomobject.c */,
                                 36C523C70DFC380300B71A79 /* bclass.c */,
                                 36C523C80DFC380300B71A79 /* Makefile.kup */,
@@ -154 +159 @@
                         isa = PBXGroup;
                         children = (
+                                36C780090E0ED8F800B897F3 /* testnomclassmgr.idl */,
+                                36C5245A0DFC512E00B71A79 /* testnomobject.idl */,
                                 36C523D70DFC380300B71A79 /* aclass.idl */,
                                 36C523D80DFC380300B71A79 /* bclass.idl */,
@@ -369 +376 @@
                                 36C5242F0DFC389F00B71A79 /* nombuildnomcls.c */,
                                 36C524300DFC389F00B71A79 /* nomtkinit.c */,
-                                36C524310DFC389F00B71A79 /* _nomgc.c */,
                                 36C524320DFC389F00B71A79 /* thunk.c */,
                                 36C524330DFC389F00B71A79 /* nomid.c */,

trunk/nom/class_c/nomcls.c

@@ -163 +163 @@
 
 /**
-   Function which implements the nomGetCreatedClassName() method of NOMClass.
+   Function which implements the nomQueryCreatedClassName() method of NOMClass.
 */
-NOM_Scope CORBA_string NOMLINK impl_NOMClass_nomGetCreatedClassName(NOMClass* nomSelf, CORBA_Environment *ev)
+NOM_Scope CORBA_string NOMLINK impl_NOMClass_nomQueryCreatedClassName(NOMClass* nomSelf, CORBA_Environment *ev)
 {
   NOMClassPriv* ncp;

trunk/nom/idl/nomcls.idl

@@ -76 +76 @@
      This method is usually not overriden.
 
-     \sa nomGetClassName()
+     \sa nomQueryClassName()
    */
-  string nomGetCreatedClassName();
+  string nomQueryCreatedClassName();
 
   /**

trunk/nom/src/nomdebug.c

@@ -67 +67 @@
       g_error("The object used to call the method %s is not a valid NOM object. ", chrMethodName);
     else
-      g_error("The object for which the method %s should be called is not valid for this method.\nThe object must be some instance of class %s (or of a subclass) but is a %s.", chrMethodName, NOMClass_nomGetCreatedClassName(nomClass, NULL), 
+      g_error("The object for which the method %s should be called is not valid for this method.\nThe object must be some instance of class %s (or of a subclass) but is a %s.", chrMethodName, NOMClass_nomQueryCreatedClassName(nomClass, NULL), 
                 NOMObject_nomQueryClassName(nomObject, NULL));
   }

trunk/tests/class_c/testnomclassmgr.c

@@ -71 +71 @@
       break;
     
-    if(0!=strcmp( _nomGetCreatedClassName(nClassObject, NULL), "NOMObject"))
+    if(0!=strcmp( _nomQueryCreatedClassName(nClassObject, NULL), "NOMObject"))
       break;