Changeset 10464 for code/branches/core7/src/orxonox/chat

Timestamp:

May 25, 2015, 12:13:34 AM (10 years ago)

Author:

landauf

Message:

define ScopeID as integer constants instead of an enum. this allows to extend it and add new scopes outside of core.

Location:

code/branches/core7/src/orxonox/chat

Files:

• ChatHistory.cc (modified) (1 diff)
• ChatInputHandler.cc (modified) (1 diff)
• ChatManager.cc (modified) (1 diff)

code/branches/core7/src/orxonox/chat/ChatHistory.cc

@@ -34 +34 @@
 {
   /* singleton */
-  ManageScopedSingleton( ChatHistory, ScopeID::Root, false );
+  ManageScopedSingleton( ChatHistory, ScopeID::ROOT, false );
 
   RegisterAbstractClass(ChatHistory).inheritsFrom<ChatListener>();

code/branches/core7/src/orxonox/chat/ChatInputHandler.cc

@@ -62 +62 @@
 {
   /* singleton */
-  ManageScopedSingleton( ChatInputHandler, ScopeID::Graphics, false );
+  ManageScopedSingleton( ChatInputHandler, ScopeID::GRAPHICS, false );
 
   /* add commands to console */

code/branches/core7/src/orxonox/chat/ChatManager.cc

@@ -40 +40 @@
 namespace orxonox
 {
-    ManageScopedSingleton(ChatManager, ScopeID::Root, false);
+    ManageScopedSingleton(ChatManager, ScopeID::ROOT, false);
 
     SetConsoleCommand("chat", &ChatManager::chat).defaultValue(1, NETWORK_PEER_ID_BROADCAST);