From 1e1aa704a2e50d8712878253eaf8ec3d3c4a15d9 Mon Sep 17 00:00:00 2001 From: linkmauve Date: Mon, 23 Oct 2017 15:10:15 +0100 Subject: Remove new from struct initialisation, as it is deprecated (#180) * Remove new from struct initialisation, as it is deprecated. * Use Map.has_key instead of Map.contains, as it is deprecated. --- libdino/src/service/connection_manager.vala | 4 ++-- main/src/ui/conversation_summary/conversation_view.vala | 2 +- xmpp-vala/src/module/xep/0082_date_time_profiles.vala | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libdino/src/service/connection_manager.vala b/libdino/src/service/connection_manager.vala index f9dbb0e1..3f945f4c 100644 --- a/libdino/src/service/connection_manager.vala +++ b/libdino/src/service/connection_manager.vala @@ -58,7 +58,7 @@ public class ConnectionManager { } private class RecMutexWrap { - public RecMutex mutex = new RecMutex(); + public RecMutex mutex = RecMutex(); public void lock() { mutex.lock(); } public void unlock() { mutex.unlock(); } public bool trylock() { return mutex.trylock(); } @@ -121,7 +121,7 @@ public class ConnectionManager { } public Core.XmppStream? connect(Account account) { - if (!connection_mutexes.contains(account)) connection_mutexes[account] = new RecMutexWrap(); + if (!connection_mutexes.has_key(account)) connection_mutexes[account] = new RecMutexWrap(); if (!connection_todo.contains(account)) connection_todo.add(account); if (!connections.has_key(account)) { return connect_(account); diff --git a/main/src/ui/conversation_summary/conversation_view.vala b/main/src/ui/conversation_summary/conversation_view.vala index dcd24652..93464a95 100644 --- a/main/src/ui/conversation_summary/conversation_view.vala +++ b/main/src/ui/conversation_summary/conversation_view.vala @@ -27,7 +27,7 @@ public class ConversationView : Box, Plugins.ConversationItemCollection { private double? was_upper; private double? was_page_size; - private Mutex reloading_mutex = new Mutex(); + private Mutex reloading_mutex = Mutex(); private bool animate = false; public ConversationView(StreamInteractor stream_interactor) { diff --git a/xmpp-vala/src/module/xep/0082_date_time_profiles.vala b/xmpp-vala/src/module/xep/0082_date_time_profiles.vala index 8c7dffc1..b23dfe7a 100644 --- a/xmpp-vala/src/module/xep/0082_date_time_profiles.vala +++ b/xmpp-vala/src/module/xep/0082_date_time_profiles.vala @@ -1,7 +1,7 @@ namespace Xmpp.Xep.DateTimeProfiles { public DateTime? parse_string(string time_string) { - TimeVal time_val = new TimeVal(); + TimeVal time_val = TimeVal(); if (time_val.from_iso8601(time_string)) { return new DateTime.from_unix_utc(time_val.tv_sec); } -- cgit v1.2.3-54-g00ecf