diff options
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/debugger/editor_debugger_server.cpp | 2 | ||||
| -rw-r--r-- | editor/editor_log.cpp | 3 | ||||
| -rw-r--r-- | editor/editor_settings.cpp | 4 | ||||
| -rw-r--r-- | editor/fileserver/editor_file_server.h | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/editor/debugger/editor_debugger_server.cpp b/editor/debugger/editor_debugger_server.cpp index 4add891bcb..662f247062 100644 --- a/editor/debugger/editor_debugger_server.cpp +++ b/editor/debugger/editor_debugger_server.cpp @@ -40,7 +40,7 @@ class EditorDebuggerServerTCP : public EditorDebuggerServer { private: - Ref<TCP_Server> server; + Ref<TCPServer> server; public: static EditorDebuggerServer *create(const String &p_protocol); diff --git a/editor/editor_log.cpp b/editor/editor_log.cpp index 9f188b53c4..602035634a 100644 --- a/editor/editor_log.cpp +++ b/editor/editor_log.cpp @@ -187,8 +187,6 @@ void EditorLog::_add_log_line(LogMessage &p_message, bool p_replace_previous) { // Remove last line if replacing, as it will be replace by the next added line. log->remove_line(log->get_line_count() - 1); log->increment_line_count(); - } else { - log->add_newline(); } switch (p_message.type) { @@ -222,6 +220,7 @@ void EditorLog::_add_log_line(LogMessage &p_message, bool p_replace_previous) { } log->add_text(p_message.text); + log->add_newline(); // Need to use pop() to exit out of the RichTextLabels current "push" stack. // We only "push" in the above switch when message type != STD, so only pop when that is the case. diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp index 4ddae7c062..dd733aab8b 100644 --- a/editor/editor_settings.cpp +++ b/editor/editor_settings.cpp @@ -1138,14 +1138,14 @@ void EditorSettings::setup_language() { } void EditorSettings::setup_network() { - List<IP_Address> local_ip; + List<IPAddress> local_ip; IP::get_singleton()->get_local_addresses(&local_ip); String hint; String current = has_setting("network/debug/remote_host") ? get("network/debug/remote_host") : ""; String selected = "127.0.0.1"; // Check that current remote_host is a valid interface address and populate hints. - for (List<IP_Address>::Element *E = local_ip.front(); E; E = E->next()) { + for (List<IPAddress>::Element *E = local_ip.front(); E; E = E->next()) { String ip = E->get(); // link-local IPv6 addresses don't work, skipping them diff --git a/editor/fileserver/editor_file_server.h b/editor/fileserver/editor_file_server.h index 8ffd4f9692..d0405e0bb7 100644 --- a/editor/fileserver/editor_file_server.h +++ b/editor/fileserver/editor_file_server.h @@ -54,7 +54,7 @@ class EditorFileServer : public Object { bool quit = false; }; - Ref<TCP_Server> server; + Ref<TCPServer> server; Set<Thread *> to_wait; static void _close_client(ClientData *cd); |