diff -r 20ca0a6be175 -r 9b6a0daedfc0 sources/interface.h --- a/sources/interface.h Wed Jan 27 14:04:53 2021 +0200 +++ b/sources/interface.h Wed Jan 27 14:05:39 2021 +0200 @@ -49,10 +49,10 @@ }; Interface(); - void connect(String address, String password); + void connect(std::string address, std::string password); void disconnected(); RCONSession* getSession() { return &m_session; } - void handleCommand(const String& input); + void handleCommand(const std::string& input); void handleInput(); void needRefresh(); void __cdecl print(const char* fmtstr, ...); @@ -61,14 +61,14 @@ void __cdecl printText(const char* fmtstr, ...); void render(); void renderFull(); - void setPlayerNames(const StringList& names); - void setTitle(const String& message); - void tabComplete(const String& part, String complete); + void setPlayerNames(const std::vector& names); + void setTitle(const std::string& message); + void tabComplete(const std::string& part, std::string complete); void updateStatusBar(); void vprint(const char* fmtstr, va_list args); private: - StringList m_inputHistory; + std::vector m_inputHistory; int m_inputCursor; int m_cursorPosition; int m_inputPanning; @@ -80,13 +80,13 @@ struct { char ch; int x; } m_cursorCharacter; Vector m_outputLines; int m_outputScroll; - String m_title; + std::string m_title; InputState m_inputState; std::function m_disconnectCallback; IPAddress m_remoteAddress; - String m_statusBarText; + std::string m_statusBarText; std::vector m_playerNames; - String m_pasteBuffer; + std::string m_pasteBuffer; RCONSession m_session; void detachInput(); @@ -94,13 +94,13 @@ int findPreviousWord(); void flushInput(); chtype getColorPair(Color fg, Color bg); - const String& getCurrentInput(); - String& getEditableInput(); - String getPromptString(); + const std::string& getCurrentInput(); + std::string& getEditableInput(); + std::string getPromptString(); void moveInputCursor(int delta); int nicklistWidth(); void positionCursor(); - void printToConsole(String message); + void printToConsole(std::string message); int renderColorline(int y, int x0, int width, const ColoredLine& line, bool allowWrap); void renderInput(); void renderNicklist();