From a466a0a8e7543417518c356a269a2838c4497e16 Mon Sep 17 00:00:00 2001 From: Nathaniel Olsen Date: Mon, 15 Jun 2015 23:22:02 -0500 Subject: [PATCH] Undo some things by to original. --- src/chat.cpp | 4 ++-- src/chat.h | 2 +- src/guiChatConsole.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/chat.cpp b/src/chat.cpp index 4c93094c9..14aa43cec 100644 --- a/src/chat.cpp +++ b/src/chat.cpp @@ -474,7 +474,7 @@ void ChatPrompt::historyNext() } } -void ChatPrompt::nickCompletion(const std::list &names, bool backwards) +void ChatPrompt::nickCompletion(const std::list& names, bool backwards) { // Two cases: // (a) m_nick_completion_start == m_nick_completion_end == 0 @@ -551,7 +551,7 @@ void ChatPrompt::nickCompletion(const std::list &names, bool backwa m_cursor = prefix_start + replacement.size(); clampView(); m_nick_completion_start = prefix_start; - m_nick_completion_end = prefix_end; + m_nick_completion_end = prefix_end; } void ChatPrompt::reformat(u32 cols) diff --git a/src/chat.h b/src/chat.h index 02406e862..82ce80875 100644 --- a/src/chat.h +++ b/src/chat.h @@ -161,7 +161,7 @@ public: void historyNext(); // Nick completion - void nickCompletion(const std::list &names, bool backwards); + void nickCompletion(const std::list& names, bool backwards); // Update console size and reformat the visible portion of the prompt void reformat(u32 cols); diff --git a/src/guiChatConsole.cpp b/src/guiChatConsole.cpp index ffa8c7789..bb0d89778 100644 --- a/src/guiChatConsole.cpp +++ b/src/guiChatConsole.cpp @@ -552,7 +552,7 @@ bool GUIChatConsole::OnEvent(const SEvent& event) { #if (defined(linux) || defined(__linux)) wchar_t wc = L'_'; - mbtowc( &wc, (char*) &event.KeyInput.Char, sizeof(event.KeyInput.Char) ); + mbtowc( &wc, (char *) &event.KeyInput.Char, sizeof(event.KeyInput.Char) ); m_chat_backend->getPrompt().input(wc); #else m_chat_backend->getPrompt().input(event.KeyInput.Char);