14 files changed, 28 insertions, 23 deletions
diff --git a/plugins/omemo/meson.build b/plugins/omemo/meson.build
index 978fb9a6..7838a8d6 100644
--- a/plugins/omemo/meson.build
+++ b/plugins/omemo/meson.build
@@ -9,7 +9,6 @@ dependencies = [
     dep_libqrencode,
     dep_libomemo_c,
     dep_m,
-    dep_qlite,
     dep_xmpp_vala,
 ]
 sources = files(
diff --git a/plugins/omemo/src/logic/database.vala b/plugins/omemo/src/logic/database.vala
index ec5a0924..f2a92259 100644
--- a/plugins/omemo/src/logic/database.vala
+++ b/plugins/omemo/src/logic/database.vala
@@ -1,7 +1,7 @@
 using Gee;
-using Qlite;
 
 using Dino.Entities;
+using Dino.Qlite;
 
 namespace Dino.Plugins.Omemo {
 
diff --git a/plugins/omemo/src/logic/decrypt.vala b/plugins/omemo/src/logic/decrypt.vala
index 2861b42f..698d3f76 100644
--- a/plugins/omemo/src/logic/decrypt.vala
+++ b/plugins/omemo/src/logic/decrypt.vala
@@ -1,6 +1,7 @@
-using Dino.Entities;
-using Qlite;
 using Gee;
+
+using Dino.Entities;
+using Dino.Qlite;
 using Omemo;
 using Xmpp;
 
diff --git a/plugins/omemo/src/logic/manager.vala b/plugins/omemo/src/logic/manager.vala
index 71f17aae..f171a1c0 100644
--- a/plugins/omemo/src/logic/manager.vala
+++ b/plugins/omemo/src/logic/manager.vala
@@ -1,8 +1,9 @@
+using Gee;
+
 using Dino.Entities;
+using Dino.Qlite;
 using Omemo;
-using Qlite;
 using Xmpp;
-using Gee;
 
 namespace Dino.Plugins.Omemo {
 
diff --git a/plugins/omemo/src/logic/pre_key_store.vala b/plugins/omemo/src/logic/pre_key_store.vala
index c15acc84..beb2d87a 100644
--- a/plugins/omemo/src/logic/pre_key_store.vala
+++ b/plugins/omemo/src/logic/pre_key_store.vala
@@ -1,5 +1,5 @@
+using Dino.Qlite;
 using Omemo;
-using Qlite;
 
 namespace Dino.Plugins.Omemo {
 
diff --git a/plugins/omemo/src/logic/session_store.vala b/plugins/omemo/src/logic/session_store.vala
index ea5738fd..bb9ca83f 100644
--- a/plugins/omemo/src/logic/session_store.vala
+++ b/plugins/omemo/src/logic/session_store.vala
@@ -1,5 +1,5 @@
+using Dino.Qlite;
 using Omemo;
-using Qlite;
 
 namespace Dino.Plugins.Omemo {
 
diff --git a/plugins/omemo/src/logic/signed_pre_key_store.vala b/plugins/omemo/src/logic/signed_pre_key_store.vala
index d73cbe71..68f3092c 100644
--- a/plugins/omemo/src/logic/signed_pre_key_store.vala
+++ b/plugins/omemo/src/logic/signed_pre_key_store.vala
@@ -1,4 +1,4 @@
-using Qlite;
+using Dino.Qlite;
 using Omemo;
 
 namespace Dino.Plugins.Omemo {
diff --git a/plugins/omemo/src/logic/trust_manager.vala b/plugins/omemo/src/logic/trust_manager.vala
index 8cf1ddeb..f17ade99 100644
--- a/plugins/omemo/src/logic/trust_manager.vala
+++ b/plugins/omemo/src/logic/trust_manager.vala
@@ -1,8 +1,9 @@
-using Dino.Entities;
 using Gee;
-using Xmpp;
+
+using Dino.Entities;
+using Dino.Qlite;
 using Omemo;
-using Qlite;
+using Xmpp;
 
 namespace Dino.Plugins.Omemo {
 
diff --git a/plugins/omemo/src/ui/bad_messages_populator.vala b/plugins/omemo/src/ui/bad_messages_populator.vala
index 9dacba95..c291a422 100644
--- a/plugins/omemo/src/ui/bad_messages_populator.vala
+++ b/plugins/omemo/src/ui/bad_messages_populator.vala
@@ -1,8 +1,8 @@
 using Gee;
 using Gtk;
-using Qlite;
 
 using Dino.Entities;
+using Dino.Qlite;
 using Xmpp;
 
 namespace Dino.Plugins.Omemo {
diff --git a/plugins/omemo/src/ui/call_encryption_entry.vala b/plugins/omemo/src/ui/call_encryption_entry.vala
index 69b7b686..04f0443c 100644
--- a/plugins/omemo/src/ui/call_encryption_entry.vala
+++ b/plugins/omemo/src/ui/call_encryption_entry.vala
@@ -1,6 +1,7 @@
-using Dino.Entities;
 using Gtk;
-using Qlite;
+
+using Dino.Entities;
+using Dino.Qlite;
 using Xmpp;
 
 namespace Dino.Plugins.Omemo {
diff --git a/plugins/omemo/src/ui/contact_details_provider.vala b/plugins/omemo/src/ui/contact_details_provider.vala
index 7c733cd7..1b61f31d 100644
--- a/plugins/omemo/src/ui/contact_details_provider.vala
+++ b/plugins/omemo/src/ui/contact_details_provider.vala
@@ -1,6 +1,5 @@
 using Gtk;
 using Gee;
-using Qlite;
 using Dino.Entities;
 
 namespace Dino.Plugins.Omemo {
diff --git a/plugins/omemo/src/ui/encryption_list_entry.vala b/plugins/omemo/src/ui/encryption_list_entry.vala
index 3bb76c52..dfec813a 100644
--- a/plugins/omemo/src/ui/encryption_list_entry.vala
+++ b/plugins/omemo/src/ui/encryption_list_entry.vala
@@ -1,6 +1,7 @@
-using Dino.Entities;
 using Gtk;
-using Qlite;
+
+using Dino.Entities;
+using Dino.Qlite;
 using Xmpp;
 
 namespace Dino.Plugins.Omemo {
diff --git a/plugins/omemo/src/ui/encryption_preferences_entry.vala b/plugins/omemo/src/ui/encryption_preferences_entry.vala
index f0aedb6a..cea856bb 100644
--- a/plugins/omemo/src/ui/encryption_preferences_entry.vala
+++ b/plugins/omemo/src/ui/encryption_preferences_entry.vala
@@ -1,10 +1,11 @@
-using Qlite;
-using Qrencode;
 using Gee;
-using Xmpp;
-using Dino.Entities;
 using Gtk;
+using Qrencode;
+
+using Dino.Entities;
+using Dino.Qlite;
 using Omemo;
+using Xmpp;
 
 namespace Dino.Plugins.Omemo {
 
diff --git a/plugins/omemo/src/ui/manage_key_dialog.vala b/plugins/omemo/src/ui/manage_key_dialog.vala
index ac8896a5..117149b6 100644
--- a/plugins/omemo/src/ui/manage_key_dialog.vala
+++ b/plugins/omemo/src/ui/manage_key_dialog.vala
@@ -1,5 +1,6 @@
 using Gtk;
-using Qlite;
+
+using Dino.Qlite;
 
 namespace Dino.Plugins.Omemo {