Changeset 7417 for code/trunk

Timestamp:

Sep 11, 2010, 8:30:17 PM (14 years ago)

Author:

rgrieder

Message:

Removed StringCompare again.

Location:

code/trunk/src

Files:

• libraries/util/StringUtils.h (modified) (1 diff)
• modules/notifications/NotificationManager.cc (modified) (2 diffs)
• modules/notifications/NotificationQueue.cc (modified) (1 diff)
• modules/notifications/NotificationQueue.h (modified) (2 diffs)
• orxonox/interfaces/NotificationListener.h (modified) (1 diff)

code/trunk/src/libraries/util/StringUtils.h

@@ -48 +48 @@
     extern _UtilExport std::string BLANKSTRING;
 
-    //!< Struct that can be used as a comparison object for strings in stl containers.
-    _UtilExport struct StringCompare
-    {
-        bool operator() (const std::string& lhs, const std::string& rhs) const
-            { return lhs.compare(rhs) < 0; }
-    };
-
     _UtilExport std::string getUniqueNumberString();
 

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

@@ -129 +129 @@
         for(std::map<NotificationListener*, unsigned int>::iterator it = this->listenerList_.begin(); it != this->listenerList_.end(); it++) // Iterate through all NotificationListeners.
         {
-            std::set<std::string, StringCompare> set = it->first->getTargetsSet();
+            const std::set<std::string>& set = it->first->getTargetsSet();
             bool bAll = set.find(NotificationManager::ALL) != set.end();
             // If either the Notification has as sender 'all', the NotificationListener displays all Notifications or the NotificationListener has the sender of the Notification as target.
@@ -210 +210 @@
         this->listenerList_[listener] = index; // Add the NotificationListener to the list of NotificationListeners.
 
-        std::set<std::string, StringCompare> set = listener->getTargetsSet();
+        const std::set<std::string>& set = listener->getTargetsSet();
 
         // If all senders are the target of the NotificationListener, then the list of Notifications for that specific NotificationListener is the same as the list of all Notifications.

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

@@ -356 +356 @@
         bool first = true;
         // Iterate through the set of targets.
-        for(std::set<std::string, StringCompare>::const_iterator it = this->targets_.begin(); it != this->targets_.end(); it++)
+        for(std::set<std::string>::const_iterator it = this->targets_.begin(); it != this->targets_.end(); it++)
         {
             if(!first)

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

@@ -124 +124 @@
             @return Returns a set of strings holding the different targets.
             */
-            inline const std::set<std::string, StringCompare> & getTargetsSet()
+            inline const std::set<std::string> & getTargetsSet()
                 { return this->targets_; }
 
@@ -144 +144 @@
             bool registered_; //!< Helper variable to remember whether the NotificationQueue is registered already.
 
-            std::set<std::string, StringCompare> targets_; //!< The targets the NotificationQueue displays Notifications of.
+            std::set<std::string> targets_; //!< The targets the NotificationQueue displays Notifications of.
 
             std::multiset<NotificationContainer*, NotificationContainerCompare> ordering_; //!< The NotificationContainers ordered by the time they were registered.

code/trunk/src/orxonox/interfaces/NotificationListener.h

@@ -61 +61 @@
             virtual ~NotificationListener() {}
 
-            virtual const std::set<std::string, StringCompare> & getTargetsSet() = 0;
+            virtual const std::set<std::string> & getTargetsSet() = 0;
             virtual void update(void) = 0;
             virtual void update(Notification* notification, const std::time_t & time) = 0;