Changeset 7271 for code/trunk/src/libraries/core

Timestamp:

Aug 30, 2010, 8:07:38 PM (14 years ago)

Author:

rgrieder

Message:

There is no such word as "casted".
Also inserted 4 static_casts and replaced dynamic_cast with orxonox_cast in WeakPtr and SmartPtr.
Moreover found some weird code in Iterator.h with casting. Casting a NULL pointer always yields another NULL pointer.

Location:

code/trunk/src/libraries/core

Files:

• CorePrereqs.h (modified) (1 diff)
• Event.cc (modified) (1 diff)
• Identifier.h (modified) (1 diff)
• Iterator.h (modified) (5 diffs)
• ObjectList.h (modified) (1 diff)
• XMLPort.h (modified) (1 diff)
• input/InputDevice.h (modified) (1 diff)

code/trunk/src/libraries/core/CorePrereqs.h

@@ -115 +115 @@
 {
     typedef std::string LanguageEntryLabel;
+
+    template <class T, class U>
+    T orxonox_cast(U*);
 
     class ArgumentCompleter;

code/trunk/src/libraries/core/Event.cc

@@ -103 +103 @@
                     {
                         // else cast the pointer to the desired class
-                        void* castedOriginator = event.originator_->getDerivedPointer(this->subclass_->getClassID());
-                        (*this->statefunction_)(event.activate_, castedOriginator);
+                        void* castOriginator = event.originator_->getDerivedPointer(this->subclass_->getClassID());
+                        (*this->statefunction_)(event.activate_, castOriginator);
                     }
                 }

code/trunk/src/libraries/core/Identifier.h

@@ -484 +484 @@
     */
     template <class T, class U>
-    FORCEINLINE T orxonox_cast(U source)
+    FORCEINLINE T orxonox_cast(U* source)
     {
 #ifdef ORXONOX_COMPILER_MSVC

code/trunk/src/libraries/core/Iterator.h

@@ -32 +32 @@
 
     The Iterator of a given class allows to iterate through an ObjectList. Objects in
-    this list are casted to the template argument of the Iterator.
+    this list are cast to the template argument of the Iterator.
 
     Usage:
@@ -95 +95 @@
             inline Iterator(ObjectListElement<O>* element)
             {
-                this->element_ = (element) ? static_cast<ObjectListBaseElement*>(element) : 0;
+                this->element_ = element;
                 this->list_ = ClassIdentifier<O>::getIdentifier()->getObjects();
                 this->list_->registerIterator(this);
@@ -107 +107 @@
             inline Iterator(const ObjectListIterator<O>& other)
             {
-                this->element_ = (other.element_) ? static_cast<ObjectListBaseElement*>(other.element_) : 0;
+                this->element_ = other.element_;
                 this->list_ = ClassIdentifier<O>::getIdentifier()->getObjects();
                 this->list_->registerIterator(this);
@@ -162 +162 @@
                     this->list_->unregisterIterator(this);
 
-                this->element_ = (element) ? static_cast<ObjectListBaseElement*>(element) : 0;
+                this->element_ = element;
                 this->list_ = ClassIdentifier<O>::getIdentifier()->getObjects();
                 this->list_->registerIterator(this);
@@ -179 +179 @@
                     this->list_->unregisterIterator(this);
 
-                this->element_ = (other.element_) ? static_cast<ObjectListBaseElement*>(other.element_) : 0;
+                this->element_ = other.element_;
                 this->list_ = ClassIdentifier<O>::getIdentifier()->getObjects();
                 this->list_->registerIterator(this);

code/trunk/src/libraries/core/ObjectList.h

@@ -61 +61 @@
             /** @brief Returns an Iterator to the first element in the list. @return The Iterator */
             inline static ObjectListElement<T>* begin()
-                { return ((ObjectListElement<T>*)ClassIdentifier<T>::getIdentifier()->getObjects()->begin().element_); }
+            {
+                ObjectListBase* list = ClassIdentifier<T>::getIdentifier()->getObjects();
+                return static_cast<ObjectListElement<T>*>(list->begin().element_);
+            }
 
             /** @brief Returns an Iterator to the element after the last element in the list. @return The Iterator */
             inline static ObjectListElement<T>* end()
-                { return ((ObjectListElement<T>*)ClassIdentifier<T>::getIdentifier()->getObjects()->end().element_); }
+            {
+                ObjectListBase* list = ClassIdentifier<T>::getIdentifier()->getObjects();
+                return static_cast<ObjectListElement<T>*>(list->end().element_);
+            }
 
             /** @brief Returns an Iterator to the last element in the list. @return The Iterator */
             inline static ObjectListElement<T>* rbegin()
-                { return ((ObjectListElement<T>*)ClassIdentifier<T>::getIdentifier()->getObjects()->rbegin().element_); }
+            {
+                ObjectListBase* list = ClassIdentifier<T>::getIdentifier()->getObjects();
+                return static_cast<ObjectListElement<T>*>(list->rbegin().element_);
+            }
 
             /** @brief Returns an Iterator to the element before the first element in the list. @return The Iterator */
             inline static ObjectListElement<T>* rend()
-                { return ((ObjectListElement<T>*)ClassIdentifier<T>::getIdentifier()->getObjects()->rend().element_); }
+            {
+                ObjectListBase* list = ClassIdentifier<T>::getIdentifier()->getObjects();
+                return static_cast<ObjectListElement<T>*>(list->rend().element_);
+            }
     };
 }

code/trunk/src/libraries/core/XMLPort.h

@@ -541 +541 @@
             void callLoadExecutor(BaseObject* object, BaseObject* newObject)
             {
-                T* castedObject = orxonox_cast<T*>(object);
-                assert(castedObject);
-                O* castedNewObject = orxonox_cast<O*>(newObject);
-                assert(castedNewObject);
-
-                (*this->loadexecutor_)(castedObject, castedNewObject);
+                T* castObject = orxonox_cast<T*>(object);
+                assert(castObject);
+                O* castNewObject = orxonox_cast<O*>(newObject);
+                assert(castNewObject);
+
+                (*this->loadexecutor_)(castObject, castNewObject);
             }
 

code/trunk/src/libraries/core/input/InputDevice.h

@@ -132 +132 @@
         {
             oisDevice_ = static_cast<OISDeviceClass*>(oisInputManager_->createInputObject(OISDeviceValue, true));
-            // Note: after the static_cast here, the casted this pointer becomes
+            // Note: after the static_cast here, the cast this pointer becomes
             //       invalid right until the subclass has been constructed!
             oisDevice_->setEventCallback(static_cast<DeviceClass*>(this));