Changeset 11071 for code/trunk/src/orxonox/chat

Timestamp:

Jan 17, 2016, 10:29:21 PM (9 years ago)

Author:

landauf

Message:

merged branch cpp11_v3 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/chat/ChatHistory.cc (modified) (2 diffs)
• src/orxonox/chat/ChatHistory.h (modified) (1 diff)
• src/orxonox/chat/ChatInputHandler.cc (modified) (1 diff)
• src/orxonox/chat/ChatInputHandler.h (modified) (1 diff)
• src/orxonox/chat/ChatManager.cc (modified) (1 diff)
• src/orxonox/chat/ChatManager.h (modified) (2 diffs)

code/trunk/src/orxonox/chat/ChatHistory.cc

@@ -30 +30 @@
 #include "core/singleton/ScopedSingletonIncludes.h"
 #include "core/ConfigurablePaths.h"
+#include "core/CoreIncludes.h"
 
 #ifndef CHATTEST
@@ -159 +160 @@
   void ChatHistory::debug_printhist()
   {
-    /* create deque iterator */
-    std::deque<std::string>::iterator it;
-
     /* output all the strings */
-    for( it = this->hist_buffer.begin(); it != this->hist_buffer.end();
-      ++it )
-      orxout(debug_output) << *it << endl;
+    for( const std::string& hist : this->hist_buffer )
+      orxout(debug_output) << hist << endl;
 
     /* output size */

code/trunk/src/orxonox/chat/ChatHistory.h

@@ -82 +82 @@
        * \param senderID Identification number of the sender
        */
-      virtual void incomingChat(const std::string& message, const std::string& name);
+      virtual void incomingChat(const std::string& message, const std::string& name) override;
 
       /** Synchronize logfile onto the hard drive

code/trunk/src/orxonox/chat/ChatInputHandler.cc

@@ -79 +79 @@
     this->inpbuf = new InputBuffer();
     this->disp_offset = 0;
-    assert( this->inpbuf != NULL );
+    assert( this->inpbuf != nullptr );
 
     /* generate chatbox ui and chatbox-inputonly ui */

code/trunk/src/orxonox/chat/ChatInputHandler.h

@@ -125 +125 @@
        * history window of the full chat window)
        */
-      void incomingChat(const std::string& message, const std::string& name);
+      virtual void incomingChat(const std::string& message, const std::string& name) override;
 
       /** \param full true means show full chat window with history,

code/trunk/src/orxonox/chat/ChatManager.cc

@@ -107 +107 @@
 
         // notify all listeners
-        for (ObjectList<ChatListener>::iterator it = ObjectList<ChatListener>::begin(); it != ObjectList<ChatListener>::end(); ++it)
-            it->incomingChat(text, name);
+        for (ChatListener* listener : ObjectList<ChatListener>())
+            listener->incomingChat(text, name);
     }
 

code/trunk/src/orxonox/chat/ChatManager.h

@@ -47 +47 @@
         public:
             ChatManager();
-            virtual ~ChatManager() {}
+            virtual ~ChatManager() = default;
 
             static void message(const std::string& message, unsigned int targetID = NETWORK_PEER_ID_BROADCAST);
@@ -53 +53 @@
 
         protected:
-            ChatManager(const ChatManager&);
+            // non-copyable:
+            ChatManager(const ChatManager&) = delete;
+            ChatManager& operator=(const ChatManager&) = delete;
 
-            virtual void incomingChat(const std::string& message, unsigned int sourceID);
+            virtual void incomingChat(const std::string& message, unsigned int sourceID) override;
 
             static ChatManager* singletonPtr_s;