[Phission-cvs] phission/base/include phObjectList.h,1.2,1.3

[Philip T. <pt...@us...>]

Update of /cvsroot/phission/phission/base/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23435/include

Modified Files:
	phObjectList.h 
Log Message:

Had to rename most the methods that are inherited from phList/phListNode because the return types differ. Java complains when trying to compile inherited methods where return types don't match.



Index: phObjectList.h
===================================================================
RCS file: /cvsroot/phission/phission/base/include/phObjectList.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** phObjectList.h	16 Aug 2004 00:05:15 -0000	1.2
--- phObjectList.h	28 Sep 2004 06:39:31 -0000	1.3
***************
*** 46,52 ****
  
      /* cast the phListNode return; makes coding easier, cleaner */
!     phObjectNode *getNext() 
          { return (phObjectNode *)phListNode::getNext(); };
!     phObjectNode *getPrevious() 
          { return (phObjectNode *)phListNode::getPrevious(); };
      
--- 46,52 ----
  
      /* cast the phListNode return; makes coding easier, cleaner */
!     phObjectNode *getNextObject() 
          { return (phObjectNode *)phListNode::getNext(); };
!     phObjectNode *getPreviousObject() 
          { return (phObjectNode *)phListNode::getPrevious(); };
      
***************
*** 59,63 ****
  {
  protected:
!     phObjectNode    * insert    ( phObject *pobj, uint32_t index = 0 );
  
  public:
--- 59,63 ----
  {
  protected:
!     phObjectNode    * insertObject    ( phObject *pobj, uint32_t index = 0 );
  
  public:
***************
*** 65,86 ****
      ~phObjectList();
      
!     phObjectNode    * find( phObject *pobj );
  
!     phObject        * remove    ( phObjectNode   *node );    
!     phObject        * remove    ( phObject *node );    
      
!     phObjectNode    * enqueue   ( phObject *pobj );
!     phObject        * dequeue   ( );
      
!     phObjectNode    * push      ( phObject *pobj );
!     phObject        * pop       ( );
      
!     phObjectNode    * unshift   ( phObject *pobj );
!     phObject        * shift     ( );
      
      /* Cast these, it makes for easier cleaner code */
!     phObjectNode    * getHead   ()
          { return (phObjectNode *)phList::getHead(); } ;
!     phObjectNode    * getTail   ()
          { return (phObjectNode *)phList::getTail(); } ;
  };
--- 65,86 ----
      ~phObjectList();
      
!     phObjectNode    * findObject( phObject *pobj );
  
!     phObject        * removeObject    ( phObjectNode   *node );    
!     phObject        * removeObject    ( phObject *node );    
      
!     phObjectNode    * enqueueObject   ( phObject *pobj );
!     phObject        * dequeueObject   ( );
      
!     phObjectNode    * pushObject      ( phObject *pobj );
!     phObject        * popObject       ( );
      
!     phObjectNode    * unshiftObject   ( phObject *pobj );
!     phObject        * shiftObject     ( );
      
      /* Cast these, it makes for easier cleaner code */
!     phObjectNode    * getHeadObject   ()
          { return (phObjectNode *)phList::getHead(); } ;
!     phObjectNode    * getTailObject   ()
          { return (phObjectNode *)phList::getTail(); } ;
  };