Move code removing "-psn_xxx" command line arguments to common code.

[wxWidgets.git] / interface / wx / scopedptr.h

diff --git a/interface/wx/scopedptr.h b/interface/wx/scopedptr.h
index 73a5bfd43dee97dc4832f93dccc815c08300ca56..dd61be6a4f1f2045b93dc544316a16e68726afd2 100644 (file)
--- a/interface/wx/scopedptr.h
+++ b/interface/wx/scopedptr.h
@@ -2,8 +2,7 @@
 // Name:        wx/scopedptr.h
 // Purpose:     interface of wxScopedPtr
 // Author:      wxWidgets team
 // Name:        wx/scopedptr.h
 // Purpose:     interface of wxScopedPtr
 // Author:      wxWidgets team

-// RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /**
 /////////////////////////////////////////////////////////////////////////////
 
 /**


@@ -108,22 +107,22 @@ public:
         This operator gets the pointer stored in the smart pointer or returns
         @NULL if there is none.
     */
         This operator gets the pointer stored in the smart pointer or returns
         @NULL if there is none.
     */

-    const T* get();
+    T* get() const;

 
     /**
         This operator works like the standard C++ pointer operator to return the object
         being pointed to by the pointer.
 
 
     /**
         This operator works like the standard C++ pointer operator to return the object
         being pointed to by the pointer.
 

-        @note
-        If the pointer is @NULL or invalid this will crash.
+        If the internal pointer is @NULL this method will cause an assert in debug mode.

     */
     */

-    const T& operator *();
+    T& operator *() const;

 
     /**
 
     /**

-        This operator works like the standard C++ pointer operator to return the pointer
-        in the smart pointer or @NULL if it is empty.
+        Smart pointer member access. Returns pointer to its object.
+
+        If the internal pointer is @NULL this method will cause an assert in debug mode.

     */
     */

-    const T* operator ->();
+    T* operator ->() const;

 
     /**
         Returns the currently hold pointer and resets the smart pointer object to
 
     /**
         Returns the currently hold pointer and resets the smart pointer object to


@@ -234,15 +233,14 @@ public:
     /**
         Returns a reference to the object.
 
     /**
         Returns a reference to the object.
 

-        @note
-        If the internal pointer is @NULL this method will cause an assert
-        in debug mode.
+        If the internal pointer is @NULL this method will cause an assert in debug mode.

     */
     */

-    T operator*() const;
+    T& operator*() const;

 
     /**
 
     /**

-        Returns pointer to object. If the pointer is @NULL this method will
-        cause an assert in debug mode.
+        Smart pointer member access. Returns pointer to object. 
+        
+        If the internal pointer is @NULL this method will cause an assert in debug mode.

     */
     T* operator->() const;
 
     */
     T* operator->() const;