Changeset 6439

Timestamp:

Jan 3, 2010, 3:54:34 PM (14 years ago)

Author:

rgrieder

Message:

Found two macros that can be replaced by simple inline functions.

File:

• code/branches/gamestate/src/libraries/core/Language.h (modified) (2 diffs)

code/branches/gamestate/src/libraries/core/Language.h

@@ -52 +52 @@
 #include <cassert>
 #include "util/Singleton.h"
-
-#define AddLanguageEntry(label, fallbackstring) \
-    orxonox::Language::getInstance().addEntry(label, fallbackstring)
-
-#define GetLocalisation(label) \
-    orxonox::Language::getInstance().getLocalisation(label)
-
 
 namespace orxonox
@@ -140 +133 @@
             static Language* singletonPtr_s;
     };
+
+    //! Shortcut function for Language::addEntry
+    inline void AddLanguageEntry(const LanguageEntryLabel& label, const std::string& fallbackString)
+    {
+        Language::getInstance().addEntry(label, fallbackString);
+    }
+
+    //! Shortcut function for Language::getLocalisation
+    inline const std::string& GetLocalisation(const LanguageEntryLabel& label)
+    {
+        return Language::getInstance().getLocalisation(label);
+    }
 }