Omnicleanup: header cleanup, add ModApiUtil shared between game and mainmenu

[dragonfireclient.git] / src / chat.h

diff --git a/src/chat.h b/src/chat.h
index 49de529859b11da2845ccbe927b61cbf8c11f6be..e39d97ec2a67252093df25ac978be1dba286471e 100644 (file)
--- a/src/chat.h
+++ b/src/chat.h
@@ -1,6 +1,6 @@
 /*
-Minetest-c55
-Copyright (C) 2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -20,8 +20,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef CHAT_HEADER
 #define CHAT_HEADER
 
-#include "irrlichttypes_bloated.h"
+#include "irrlichttypes.h"
 #include <string>
+#include <vector>
+#include <list>
 
 // Chat console related classes, only used by the client
 
@@ -55,7 +57,7 @@ struct ChatFormattedFragment
 struct ChatFormattedLine
 {
        // Array of text fragments
-       core::array<ChatFormattedFragment> fragments;
+       std::vector<ChatFormattedFragment> fragments;
        // true if first line of one formatted ChatLine
        bool first;
 };
@@ -110,7 +112,7 @@ class ChatBuffer
        // Appends the formatted lines to the destination array and
        // returns the number of formatted lines.
        u32 formatChatLine(const ChatLine& line, u32 cols,
-                       core::array<ChatFormattedLine>& destination) const;
+                       std::vector<ChatFormattedLine>& destination) const;
 
 protected:
        s32 getTopScrollPos() const;
@@ -120,7 +122,7 @@ class ChatBuffer
        // Scrollback size
        u32 m_scrollback;
        // Array of unformatted chat lines
-       core::array<ChatLine> m_unformatted;
+       std::vector<ChatLine> m_unformatted;
        
        // Number of character columns in console
        u32 m_cols;
@@ -129,7 +131,7 @@ class ChatBuffer
        // Scroll position (console's top line index into m_formatted)
        s32 m_scroll;
        // Array of formatted lines
-       core::array<ChatFormattedLine> m_formatted;
+       std::vector<ChatFormattedLine> m_formatted;
        // Empty formatted line, for error returns
        ChatFormattedLine m_empty_formatted_line;
 };
@@ -158,7 +160,7 @@ class ChatPrompt
        void historyNext();
 
        // Nick completion
-       void nickCompletion(const core::list<std::wstring>& names, bool backwards);
+       void nickCompletion(const std::list<std::string>& names, bool backwards);
 
        // Update console size and reformat the visible portion of the prompt
        void reformat(u32 cols);
@@ -209,7 +211,7 @@ class ChatPrompt
        // Currently edited line
        std::wstring m_line;
        // History buffer
-       core::array<std::wstring> m_history;
+       std::vector<std::wstring> m_history;
        // History index (0 <= m_history_index <= m_history.size()) 
        u32 m_history_index;
        // Maximum number of history entries