Changeset 7413 for code/trunk/src/modules/notifications/NotificationQueue.cc

Timestamp:

Sep 11, 2010, 5:05:47 PM (14 years ago)

Author:

dafrick

Message:

Removing some TODO comments.
Better handling of duplicate name in Notificationlayer.lua.
Moving StringCompare object from NotificationListener to StringUtils.

File:

• code/trunk/src/modules/notifications/NotificationQueue.cc (modified) (5 diffs)

code/trunk/src/modules/notifications/NotificationQueue.cc

@@ -69 +69 @@
         // Initialize.
         this->size_ = 0;
-        this->tickTime_ = 0.0;
+        this->tickTime_ = 0.0f;
 
         // Sets the input values.
@@ -77 +77 @@
         this->setDisplayTime(displayTime);
 
-        //TODO: Destroy if registration fails?
-
         // Register the NotificationQueue with the NotificationManager.
         bool queueRegistered = NotificationManager::getInstance().registerQueue(this);
@@ -85 +83 @@
         {
             this->registered_ = false;
-            COUT(1) << "Error: Notification Queue '" << this->getName() << "' could not be registered." << std::endl;
+            COUT(1) << "Error: NotificationQueue '" << this->getName() << "' could not be registered." << std::endl;
             return;
         }
@@ -99 +97 @@
             GUIManager::getInstance().getLuaState()->doString("NotificationLayer.removeQueue(\"" + this->getName() +  "\")");
             NotificationManager::getInstance().unregisterQueue(this);
-            COUT(1) << "Error: Notification Queue '" << this->getName() << "' could not be registered." << std::endl;
+            COUT(1) << "Error: NotificationQueue '" << this->getName() << "' could not be registered." << std::endl;
             return;
         }
@@ -358 +356 @@
         bool first = true;
         // Iterate through the set of targets.
-        for(std::set<std::string, NotificationListenerStringCompare>::const_iterator it = this->targets_.begin(); it != this->targets_.end(); it++)
+        for(std::set<std::string, StringCompare>::const_iterator it = this->targets_.begin(); it != this->targets_.end(); it++)
         {
             if(!first)