Changeset 5796 for code/branches/core5

Timestamp:

Sep 26, 2009, 10:15:53 PM (15 years ago)

Author:

landauf

Message:

replaced delete with destroy() in core

Location:

code/branches/core5/src/libraries/core

Files:

• Identifier.cc (modified) (1 diff)
• Loader.cc (modified) (2 diffs)
• Shell.cc (modified) (1 diff)
• input/InputManager.cc (modified) (2 diffs)

code/branches/core5/src/libraries/core/Identifier.cc

@@ -203 +203 @@
             {
                 BaseObject* temp = it->second->fabricate(0);
-                delete temp;
+                temp->destroy();
             }
         }

code/branches/core5/src/libraries/core/Loader.cc

@@ -103 +103 @@
         {
             if (mask.isIncluded(it->getIdentifier()))
-                delete (*(it++));
+                (it++)->destroy();
             else
                 ++it;
@@ -204 +204 @@
         {
             if ((it->getFile() == file) && mask.isIncluded(it->getIdentifier()))
-                delete (*(it++));
+                (it++)->destroy();
             else
                 ++it;

code/branches/core5/src/libraries/core/Shell.cc

@@ -88 +88 @@
         OutputHandler::getOutStream().setOutputBuffer(0);
         if (this->inputBuffer_)
-            delete this->inputBuffer_;
+            this->inputBuffer_->destroy();
     }
 

code/branches/core5/src/libraries/core/input/InputManager.cc

@@ -289 +289 @@
 
         // Destroy calibrator helper handler and state
-        delete keyDetector_;
+        keyDetector_->destroy();
         this->destroyState("calibrator");
         // Destroy KeyDetector and state
-        delete calibratorCallbackHandler_;
+        calibratorCallbackHandler_->destroy();
         this->destroyState("detector");
         // destroy the empty InputState
@@ -722 +722 @@
         }
         statesByName_.erase(state->getName());
-        delete state;
+        state->destroy();
     }
 }