Changeset 6417 for code/trunk/src/modules/questsystem/notifications

Timestamp:

Dec 25, 2009, 10:23:58 PM (15 years ago)

Author:

rgrieder

Message:

Merged presentation2 branch back to trunk.
Major new features:

• Actual GUI with settings, etc.
• Improved space ship steering (human interaction)
• Rocket fire and more particle effects
• Advanced sound framework

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/questsystem/notifications/Notification.cc (modified) (6 diffs)
• src/modules/questsystem/notifications/NotificationManager.cc (modified) (1 diff)
• src/modules/questsystem/notifications/NotificationQueue.cc (modified) (4 diffs)

code/trunk/src/modules/questsystem/notifications/Notification.cc

@@ -49 +49 @@
         this->initialize();
     }
-    
+
     /**
     @brief
@@ -60 +60 @@
         this->message_ = message;
     }
-    
+
     /**
     @brief
@@ -68 +68 @@
     {
     }
-    
+
     /**
     @brief
@@ -75 +75 @@
     void Notification::initialize(void)
     {
-        this->message_ = "";
+        this->message_.clear();
         this->sender_ = NotificationManager::NONE;
         this->sent_ = false;
     }
-    
+
     /**
     @brief
@@ -90 +90 @@
         return this->send(NotificationManager::NONE);
     }
-    
+
     /**
     @brief
@@ -106 +106 @@
             return false;
         this->sent_ = true;
-        
+
         COUT(3) << "Notification \"" << this->getMessage() << "\" sent." << std::endl;
-        
+
         return true;
     }
-    
+
     /**
     @brief

code/trunk/src/modules/questsystem/notifications/NotificationManager.cc

@@ -44 +44 @@
 {
 
-    const std::string NotificationManager::ALL = "all";
-    const std::string NotificationManager::NONE = "none";
+    const std::string NotificationManager::ALL("all");
+    const std::string NotificationManager::NONE("none");
 
-    NotificationManager* NotificationManager::singletonPtr_s = NULL;
     ManageScopedSingleton(NotificationManager, ScopeID::Root, false);
 

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

@@ -46 +46 @@
     CreateFactory(NotificationQueue);
 
-    const std::string NotificationQueue::DEFAULT_FONT = "VeraMono";
-    const Vector2 NotificationQueue::DEFAULT_POSITION = Vector2(0.0,0.0);
-    const float NotificationQueue::DEFAULT_FONT_SIZE  = 0.025f;
+    const std::string NotificationQueue::DEFAULT_FONT("VeraMono");
+    const Vector2 NotificationQueue::DEFAULT_POSITION(0.0,0.0);
+    const float NotificationQueue::DEFAULT_FONT_SIZE = 0.025f;
 
     /**
@@ -271 +271 @@
             if(!first)
             {
-                *string += ",";
+                *string += ',';
             }
             else
@@ -300 +300 @@
         while( index < targets.size() ) //!< Go through the string, character by character until the end is reached.
         {
-            pTemp = new std::string("");
+            pTemp = new std::string();
             while(index < targets.size() && targets[index] != ',' && targets[index] != ' ')
             {
@@ -399 +399 @@
         std::ostringstream stream;
         stream << reinterpret_cast<unsigned long>(notification);
-        std::string addressString = stream.str() ;
+        const std::string& addressString = stream.str();
         container->name = "NotificationOverlay(" + timeString + ")&" + addressString;