Changeset 728 for code/branches/FICN/src/orxonox/core

Timestamp:

Dec 30, 2007, 6:56:58 PM (17 years ago)

Author:

nicolasc

Message:

• various cleanup
• improved readability in PI
• fixed iterator in language

Location:

code/branches/FICN/src/orxonox/core

Files:

• CorePrereqs.h (modified) (1 diff)
• Language.cc (modified) (5 diffs)
• Language.h (modified) (1 diff)

code/branches/FICN/src/orxonox/core/CorePrereqs.h

@@ -27 +27 @@
 
 /**
- @file  OrxonoxPrereq.cc
+ @file  OrxonoxPrereq.h
  @brief Contains all the necessary forward declarations for all classes, structs and enums.
  */

code/branches/FICN/src/orxonox/core/Language.cc

@@ -142 +142 @@
 
         // Make sure we don't create a duplicate entry
-        if (!it->second)
+        if (it == this->languageEntries_.end())
         {
             LanguageEntry* newEntry = new LanguageEntry(entry);
@@ -161 +161 @@
     void Language::addEntry(const LanguageEntryName& name, const std::string& entry)
     {
+        COUT(5) << "Called addEntry with\n  name: " << name << "\n  entry: " <<  entry << std::endl;
         std::map<std::string, LanguageEntry*>::const_iterator it = this->languageEntries_.find(name);
-        if (!it->second)
+        if (it == this->languageEntries_.end())
         {
             // The entry isn't available yet, meaning it's new, so create it
@@ -180 +181 @@
         // Write the default language file because either a new entry was created or an existing entry has changed
         this->writeDefaultLanguageFile();
+
     }
 
@@ -190 +192 @@
     {
         std::map<std::string, LanguageEntry*>::const_iterator it = this->languageEntries_.find(name);
-        if (it->second)
+        if (it != this->languageEntries_.end())
             return it->second->getTranslation();
         else
@@ -294 +296 @@
 
                     // Check if the entry exists
-                    if (it->second)
+                    if (it != this->languageEntries_.end())
                         it->second->setTranslation(lineString.substr(pos + 1));
                     else

code/branches/FICN/src/orxonox/core/Language.h

@@ -63 +63 @@
             void setDefault(const std::string& fallbackEntry);
 
-            /** @brief Returns the translated entry in the configured language. @return The translated entry */
+            /**
+              @brief Returns the translated entry in the configured language.
+              @return The translated entry
+            */
             inline const std::string& getTranslation()
                 { return this->translatedEntry_; }
 
-            /** @brief Returns the default entry. @return The default entry */
+            /**
+              @brief Returns the default entry.
+              @return The default entry
+            */
             inline const std::string& getDefault()
                 { return this->fallbackEntry_; }