[folks] Fix non-matching generic types of inferface implementations
- From: Rico Tzschichholz <ricotz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [folks] Fix non-matching generic types of inferface implementations
- Date: Fri, 30 Sep 2016 14:14:32 +0000 (UTC)
commit ddc7e71c5d0d113a1b46e2a89986f5a9c3ab8374
Author: Rico Tzschichholz <ricotz ubuntu com>
Date: Fri Sep 30 16:12:59 2016 +0200
Fix non-matching generic types of inferface implementations
Reviewed-by: Philip Withnall <philip withnall collabora co uk> (via IRC)
backends/bluez/bluez-backend.vala | 2 +-
backends/bluez/bluez-persona-store.vala | 2 +-
backends/dummy/lib/dummy-backend.vala | 2 +-
backends/dummy/lib/dummy-persona-store.vala | 2 +-
backends/eds/lib/edsf-persona-store.vala | 2 +-
backends/key-file/kf-backend.vala | 2 +-
backends/key-file/kf-persona-store.vala | 2 +-
backends/ofono/ofono-backend.vala | 2 +-
backends/ofono/ofono-persona-store.vala | 2 +-
backends/telepathy/lib/tpf-persona-store.vala | 2 +-
backends/telepathy/tp-backend.vala | 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/backends/bluez/bluez-backend.vala b/backends/bluez/bluez-backend.vala
index 8f14cda..aeb02ba 100644
--- a/backends/bluez/bluez-backend.vala
+++ b/backends/bluez/bluez-backend.vala
@@ -146,7 +146,7 @@ public class Folks.Backends.BlueZ.Backend : Folks.Backend
*
* @since 0.9.6
*/
- public override Map<string, PersonaStore> persona_stores
+ public override Map<string, Folks.PersonaStore> persona_stores
{
get { return this._persona_stores_ro; }
}
diff --git a/backends/bluez/bluez-persona-store.vala b/backends/bluez/bluez-persona-store.vala
index d4eb76e..7c455c5 100644
--- a/backends/bluez/bluez-persona-store.vala
+++ b/backends/bluez/bluez-persona-store.vala
@@ -186,7 +186,7 @@ public class Folks.Backends.BlueZ.PersonaStore : Folks.PersonaStore
*
* @since 0.9.6
*/
- public override Map<string, Persona> personas
+ public override Map<string, Folks.Persona> personas
{
get { return this._personas_ro; }
}
diff --git a/backends/dummy/lib/dummy-backend.vala b/backends/dummy/lib/dummy-backend.vala
index a7c5062..5ba8daf 100644
--- a/backends/dummy/lib/dummy-backend.vala
+++ b/backends/dummy/lib/dummy-backend.vala
@@ -116,7 +116,7 @@ public class FolksDummy.Backend : Folks.Backend
*
* @since 0.9.7
*/
- public override Map<string, PersonaStore> persona_stores
+ public override Map<string, Folks.PersonaStore> persona_stores
{
get { return this._enabled_persona_stores_ro; }
}
diff --git a/backends/dummy/lib/dummy-persona-store.vala b/backends/dummy/lib/dummy-persona-store.vala
index 20094a9..5472110 100644
--- a/backends/dummy/lib/dummy-persona-store.vala
+++ b/backends/dummy/lib/dummy-persona-store.vala
@@ -225,7 +225,7 @@ public class FolksDummy.PersonaStore : Folks.PersonaStore
*
* @since 0.9.7
*/
- public override Map<string, Persona> personas
+ public override Map<string, Folks.Persona> personas
{
get { return this._personas_ro; }
}
diff --git a/backends/eds/lib/edsf-persona-store.vala b/backends/eds/lib/edsf-persona-store.vala
index 3244553..a0203c5 100644
--- a/backends/eds/lib/edsf-persona-store.vala
+++ b/backends/eds/lib/edsf-persona-store.vala
@@ -264,7 +264,7 @@ public class Edsf.PersonaStore : Folks.PersonaStore
*
* @since 0.6.0
*/
- public override Map<string, Persona> personas
+ public override Map<string, Folks.Persona> personas
{
get { return this._personas_ro; }
}
diff --git a/backends/key-file/kf-backend.vala b/backends/key-file/kf-backend.vala
index 67722b2..52d94de 100644
--- a/backends/key-file/kf-backend.vala
+++ b/backends/key-file/kf-backend.vala
@@ -72,7 +72,7 @@ public class Folks.Backends.Kf.Backend : Folks.Backend
/**
* {@inheritDoc}
*/
- public override Map<string, PersonaStore> persona_stores
+ public override Map<string, Folks.PersonaStore> persona_stores
{
get { return this._persona_stores_ro; }
}
diff --git a/backends/key-file/kf-persona-store.vala b/backends/key-file/kf-persona-store.vala
index 47d3f63..717e748 100644
--- a/backends/key-file/kf-persona-store.vala
+++ b/backends/key-file/kf-persona-store.vala
@@ -141,7 +141,7 @@ public class Folks.Backends.Kf.PersonaStore : Folks.PersonaStore
/**
* {@inheritDoc}
*/
- public override Map<string, Persona> personas
+ public override Map<string, Folks.Persona> personas
{
get { return this._personas_ro; }
}
diff --git a/backends/ofono/ofono-backend.vala b/backends/ofono/ofono-backend.vala
index 3f2ed58..f9d30c6 100644
--- a/backends/ofono/ofono-backend.vala
+++ b/backends/ofono/ofono-backend.vala
@@ -72,7 +72,7 @@ public class Folks.Backends.Ofono.Backend : Folks.Backend
/**
* {@inheritDoc}
*/
- public override Map<string, PersonaStore> persona_stores
+ public override Map<string, Folks.PersonaStore> persona_stores
{
get { return this._persona_stores_ro; }
}
diff --git a/backends/ofono/ofono-persona-store.vala b/backends/ofono/ofono-persona-store.vala
index f649886..38047c3 100644
--- a/backends/ofono/ofono-persona-store.vala
+++ b/backends/ofono/ofono-persona-store.vala
@@ -110,7 +110,7 @@ public class Folks.Backends.Ofono.PersonaStore : Folks.PersonaStore
/**
* {@inheritDoc}
*/
- public override Map<string, Persona> personas
+ public override Map<string, Folks.Persona> personas
{
get { return this._personas_ro; }
}
diff --git a/backends/telepathy/lib/tpf-persona-store.vala b/backends/telepathy/lib/tpf-persona-store.vala
index 499f48e..025c240 100644
--- a/backends/telepathy/lib/tpf-persona-store.vala
+++ b/backends/telepathy/lib/tpf-persona-store.vala
@@ -227,7 +227,7 @@ public class Tpf.PersonaStore : Folks.PersonaStore
*
* See {@link Folks.PersonaStore.personas}.
*/
- public override Map<string, Persona> personas
+ public override Map<string, Folks.Persona> personas
{
get { return this._personas_ro; }
}
diff --git a/backends/telepathy/tp-backend.vala b/backends/telepathy/tp-backend.vala
index bc80012..240f578 100644
--- a/backends/telepathy/tp-backend.vala
+++ b/backends/telepathy/tp-backend.vala
@@ -46,7 +46,7 @@ public class Folks.Backends.Tp.Backend : Folks.Backend
/**
* {@inheritDoc}
*/
- public override Map<string, PersonaStore> persona_stores
+ public override Map<string, Folks.PersonaStore> persona_stores
{
get { return Tpf.PersonaStore.list_persona_stores (); }
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]