Change typedef to normal definitions in GUI code

[dragonfireclient.git] / src / chat.h

diff --git a/src/chat.h b/src/chat.h
index e3961b3fa2667120a3492f5d413e0dc880652cd9..0b98e4d3c0507118b6485a70754998ad36ba128b 100644 (file)
--- a/src/chat.h
+++ b/src/chat.h
@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef CHAT_HEADER
-#define CHAT_HEADER
+#pragma once
 
 #include <string>
 #include <vector>
@@ -26,6 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "irrlichttypes.h"
 #include "util/enriched_string.h"
+#include "settings.h"
 
 // Chat console related classes
 
@@ -77,7 +77,7 @@ class ChatBuffer
 
        // Append chat line
        // Removes oldest chat line if scrollback size is reached
-       void addLine(std::wstring name, std::wstring text);
+       void addLine(const std::wstring &name, const std::wstring &text);
 
        // Remove all chat lines
        void clear();
@@ -94,8 +94,6 @@ class ChatBuffer
        // Delete lines older than maxAge.
        void deleteByAge(f32 maxAge);
 
-       // Get number of columns, 0 if reformat has not been called yet.
-       u32 getColumns() const;
        // Get number of rows, 0 if reformat has not been called yet.
        u32 getRows() const;
        // Update console size and reformat all formatted lines.
@@ -119,6 +117,7 @@ class ChatBuffer
        u32 formatChatLine(const ChatLine& line, u32 cols,
                        std::vector<ChatFormattedLine>& destination) const;
 
+       void resize(u32 scrollback);
 protected:
        s32 getTopScrollPos() const;
        s32 getBottomScrollPos() const;
@@ -152,7 +151,7 @@ class ChatPrompt
        void input(const std::wstring &str);
 
        // Add a string to the history
-       void addToHistory(std::wstring line);
+       void addToHistory(const std::wstring &line);
 
        // Get current line
        std::wstring getLine() const { return m_line; }
@@ -164,7 +163,7 @@ class ChatPrompt
        void clear();
 
        // Replace the current line with the given text
-       std::wstring replace(std::wstring line);
+       std::wstring replace(const std::wstring &line);
 
        // Select previous command from history
        void historyPrev();
@@ -255,7 +254,7 @@ class ChatBackend
        ~ChatBackend() = default;
 
        // Add chat message
-       void addMessage(std::wstring name, std::wstring text);
+       void addMessage(const std::wstring &name, std::wstring text);
        // Parse and add unparsed chat message
        void addUnparsedMessage(std::wstring line);
 
@@ -264,7 +263,7 @@ class ChatBackend
        // Get the recent messages buffer
        ChatBuffer& getRecentBuffer();
        // Concatenate all recent messages
-       EnrichedString getRecentChat();
+       EnrichedString getRecentChat() const;
        // Get the console prompt
        ChatPrompt& getPrompt();
 
@@ -282,11 +281,11 @@ class ChatBackend
        void scrollPageDown();
        void scrollPageUp();
 
+       // Resize recent buffer based on settings
+       void applySettings();
+
 private:
        ChatBuffer m_console_buffer;
        ChatBuffer m_recent_buffer;
        ChatPrompt m_prompt;
 };
-
-#endif
-