diff options
| author | Marvin W <git@larma.de> | 2026-08-23 19:32:25 +0200 |
|---|---|---|
| committer | Marvin W <git@larma.de> | 2026-10-23 16:59:51 +0200 |
| commit | 98ef191bfb3cc5694b9d1001e46a9b00abbd7195 (patch) | |
| tree | b6d30b203266afe44f0b5ae8aaf479960e361273 | |
| parent | b0456e13ed35e6ebf684b3a7f4d1cb4b6ec352cc (diff) | |
Move qlite into libdino
53 files changed, 68 insertions, 94 deletions
diff --git a/libdino/dino.deps b/libdino/dino.deps index bef3fb2a..b14c7d54 100644 --- a/libdino/dino.deps +++ b/libdino/dino.deps @@ -2,5 +2,5 @@ gee-0.8 gio-2.0 glib-2.0 gmodule-2.0 -qlite +sqlite3 xmpp-vala diff --git a/libdino/meson.build b/libdino/meson.build index dbaddf56..5c7c20c4 100644 --- a/libdino/meson.build +++ b/libdino/meson.build @@ -9,7 +9,7 @@ dependencies = [ dep_gmodule, dep_libsoup, dep_libsrtp2, - dep_qlite, + dep_sqlite3, dep_xmpp_vala ] sources = files( @@ -34,6 +34,16 @@ sources = files( 'src/plugin/interfaces.vala', 'src/plugin/loader.vala', 'src/plugin/registry.vala', + 'src/qlite/column.vala', + 'src/qlite/database.vala', + 'src/qlite/delete_builder.vala', + 'src/qlite/insert_builder.vala', + 'src/qlite/query_builder.vala', + 'src/qlite/row.vala', + 'src/qlite/statement_builder.vala', + 'src/qlite/table.vala', + 'src/qlite/update_builder.vala', + 'src/qlite/upsert_builder.vala', 'src/service/avatar_manager.vala', 'src/service/blocking_manager.vala', 'src/service/call_store.vala', diff --git a/qlite/src/column.vala b/libdino/src/qlite/column.vala index 36c8fcff..8f45307f 100644 --- a/qlite/src/column.vala +++ b/libdino/src/qlite/column.vala @@ -1,6 +1,6 @@ using Sqlite; -namespace Qlite { +namespace Dino.Qlite { public abstract class Column<T> { public const string DEFAULT_TABLE_NAME = ""; diff --git a/qlite/src/database.vala b/libdino/src/qlite/database.vala index 8b2f447d..e55d5b59 100644 --- a/qlite/src/database.vala +++ b/libdino/src/qlite/database.vala @@ -1,6 +1,6 @@ using Sqlite; -namespace Qlite { +namespace Dino.Qlite { public class Database { private string file_name; diff --git a/qlite/src/delete_builder.vala b/libdino/src/qlite/delete_builder.vala index 45e09dc7..df63bba6 100644 --- a/qlite/src/delete_builder.vala +++ b/libdino/src/qlite/delete_builder.vala @@ -1,6 +1,6 @@ using Sqlite; -namespace Qlite { +namespace Dino.Qlite { public class DeleteBuilder : StatementBuilder { diff --git a/qlite/src/insert_builder.vala b/libdino/src/qlite/insert_builder.vala index 8b14b33f..3383f0e2 100644 --- a/qlite/src/insert_builder.vala +++ b/libdino/src/qlite/insert_builder.vala @@ -1,6 +1,6 @@ using Sqlite; -namespace Qlite { +namespace Dino.Qlite { public class InsertBuilder : StatementBuilder { diff --git a/qlite/src/query_builder.vala b/libdino/src/qlite/query_builder.vala index 88f05e04..40514fd5 100644 --- a/qlite/src/query_builder.vala +++ b/libdino/src/qlite/query_builder.vala @@ -1,6 +1,6 @@ using Sqlite; -namespace Qlite { +namespace Dino.Qlite { public class QueryBuilder : StatementBuilder { private bool single_result; diff --git a/qlite/src/row.vala b/libdino/src/qlite/row.vala index 4671db20..65c80f02 100644 --- a/qlite/src/row.vala +++ b/libdino/src/qlite/row.vala @@ -1,7 +1,7 @@ using Gee; using Sqlite; -namespace Qlite { +namespace Dino.Qlite { public class Row { private Map<string, string?> text_map = new HashMap<string, string?>(); diff --git a/qlite/src/statement_builder.vala b/libdino/src/qlite/statement_builder.vala index dca6983e..5c756ab3 100644 --- a/qlite/src/statement_builder.vala +++ b/libdino/src/qlite/statement_builder.vala @@ -1,6 +1,6 @@ using Sqlite; -namespace Qlite { +namespace Dino.Qlite { public abstract class StatementBuilder { protected Database db; diff --git a/qlite/src/table.vala b/libdino/src/qlite/table.vala index a5a57c49..3b75e22e 100644 --- a/qlite/src/table.vala +++ b/libdino/src/qlite/table.vala @@ -1,6 +1,6 @@ using Sqlite; -namespace Qlite { +namespace Dino.Qlite { public class Table { protected Database db; diff --git a/qlite/src/update_builder.vala b/libdino/src/qlite/update_builder.vala index 0bf83aee..d371a93a 100644 --- a/qlite/src/update_builder.vala +++ b/libdino/src/qlite/update_builder.vala @@ -1,6 +1,6 @@ using Sqlite; -namespace Qlite { +namespace Dino.Qlite { public class UpdateBuilder : StatementBuilder { diff --git a/qlite/src/upsert_builder.vala b/libdino/src/qlite/upsert_builder.vala index 79104972..e9a73e4f 100644 --- a/qlite/src/upsert_builder.vala +++ b/libdino/src/qlite/upsert_builder.vala @@ -1,6 +1,6 @@ using Sqlite; -namespace Qlite { +namespace Dino.Qlite { public class UpsertBuilder : StatementBuilder { // INTO [...] diff --git a/libdino/src/service/avatar_manager.vala b/libdino/src/service/avatar_manager.vala index 0c98a8f3..ac4971ef 100644 --- a/libdino/src/service/avatar_manager.vala +++ b/libdino/src/service/avatar_manager.vala @@ -1,9 +1,9 @@ using Gdk; using Gee; -using Qlite; -using Xmpp; using Dino.Entities; +using Dino.Qlite; +using Xmpp; namespace Dino { diff --git a/libdino/src/service/call_store.vala b/libdino/src/service/call_store.vala index bfc8255f..9e32517f 100644 --- a/libdino/src/service/call_store.vala +++ b/libdino/src/service/call_store.vala @@ -1,8 +1,8 @@ using Xmpp; using Gee; -using Qlite; using Dino.Entities; +using Dino.Qlite; namespace Dino { diff --git a/libdino/src/service/contact_model.vala b/libdino/src/service/contact_model.vala index 33f6126b..3e52e040 100644 --- a/libdino/src/service/contact_model.vala +++ b/libdino/src/service/contact_model.vala @@ -1,6 +1,5 @@ using Xmpp; using Gee; -using Qlite; using Dino.Entities; diff --git a/libdino/src/service/content_item_store.vala b/libdino/src/service/content_item_store.vala index cf4c6975..5e440c76 100644 --- a/libdino/src/service/content_item_store.vala +++ b/libdino/src/service/content_item_store.vala @@ -1,7 +1,7 @@ using Gee; using Dino.Entities; -using Qlite; +using Dino.Qlite; using Xmpp; namespace Dino { diff --git a/libdino/src/service/database.vala b/libdino/src/service/database.vala index 8432ff40..4319e027 100644 --- a/libdino/src/service/database.vala +++ b/libdino/src/service/database.vala @@ -1,8 +1,8 @@ using Gee; -using Qlite; using Xmpp; using Dino.Entities; +using Dino.Qlite; namespace Dino { diff --git a/libdino/src/service/entity_info.vala b/libdino/src/service/entity_info.vala index 03828d1d..e9a20df1 100644 --- a/libdino/src/service/entity_info.vala +++ b/libdino/src/service/entity_info.vala @@ -1,6 +1,6 @@ using Gee; using Dino.Entities; -using Qlite; +using Dino.Qlite; using Xmpp; using Xmpp.Xep; using Xmpp.Xep.ServiceDiscovery; diff --git a/libdino/src/service/fallback_body.vala b/libdino/src/service/fallback_body.vala index 0ce89ade..09aa839a 100644 --- a/libdino/src/service/fallback_body.vala +++ b/libdino/src/service/fallback_body.vala @@ -1,5 +1,4 @@ using Gee; -using Qlite; using Xmpp; using Xmpp.Xep; diff --git a/libdino/src/service/file_transfer_storage.vala b/libdino/src/service/file_transfer_storage.vala index b4a4db3e..33ebcbce 100644 --- a/libdino/src/service/file_transfer_storage.vala +++ b/libdino/src/service/file_transfer_storage.vala @@ -1,8 +1,8 @@ using Xmpp; using Gee; -using Qlite; using Dino.Entities; +using Dino.Qlite; namespace Dino { diff --git a/libdino/src/service/history_sync.vala b/libdino/src/service/history_sync.vala index 9bd3f54f..a7a99d2d 100644 --- a/libdino/src/service/history_sync.vala +++ b/libdino/src/service/history_sync.vala @@ -3,7 +3,7 @@ using Gee; using Xmpp; using Xmpp.Xep; using Dino.Entities; -using Qlite; +using Dino.Qlite; public class Dino.HistorySync { diff --git a/libdino/src/service/message_correction.vala b/libdino/src/service/message_correction.vala index 164106e0..02151ac8 100644 --- a/libdino/src/service/message_correction.vala +++ b/libdino/src/service/message_correction.vala @@ -3,7 +3,7 @@ using Gee; using Xmpp; using Xmpp.Xep; using Dino.Entities; -using Qlite; +using Dino.Qlite; namespace Dino { diff --git a/libdino/src/service/message_deletion.vala b/libdino/src/service/message_deletion.vala index 4467311e..0060a7e2 100644 --- a/libdino/src/service/message_deletion.vala +++ b/libdino/src/service/message_deletion.vala @@ -3,7 +3,6 @@ using Gee; using Xmpp; using Xmpp.Xep; using Dino.Entities; -using Qlite; namespace Dino { diff --git a/libdino/src/service/message_processor.vala b/libdino/src/service/message_processor.vala index 9190cd9d..7997af67 100644 --- a/libdino/src/service/message_processor.vala +++ b/libdino/src/service/message_processor.vala @@ -3,7 +3,7 @@ using Gee; using Xmpp; using Xmpp.Xep; using Dino.Entities; -using Qlite; +using Dino.Qlite; namespace Dino { diff --git a/libdino/src/service/message_storage.vala b/libdino/src/service/message_storage.vala index d6b8d6e3..2567738c 100644 --- a/libdino/src/service/message_storage.vala +++ b/libdino/src/service/message_storage.vala @@ -1,8 +1,8 @@ using Xmpp; using Gee; -using Qlite; using Dino.Entities; +using Dino.Qlite; namespace Dino { diff --git a/libdino/src/service/occupant_id_store.vala b/libdino/src/service/occupant_id_store.vala index 662b9cbb..d2849652 100644 --- a/libdino/src/service/occupant_id_store.vala +++ b/libdino/src/service/occupant_id_store.vala @@ -1,8 +1,8 @@ using Xmpp; using Gee; -using Qlite; using Dino.Entities; +using Dino.Qlite; namespace Dino { diff --git a/libdino/src/service/reactions.vala b/libdino/src/service/reactions.vala index 16849c68..8f3aa4fa 100644 --- a/libdino/src/service/reactions.vala +++ b/libdino/src/service/reactions.vala @@ -1,9 +1,9 @@ using Gee; -using Qlite; +using Dino.Entities; +using Dino.Qlite; using Xmpp; using Xmpp.Xep; -using Dino.Entities; public class Dino.Reactions : StreamInteractionModule, Object { public static ModuleIdentity<Reactions> IDENTITY = new ModuleIdentity<Reactions>("reactions"); diff --git a/libdino/src/service/replies.vala b/libdino/src/service/replies.vala index ea10cf88..95c28ef1 100644 --- a/libdino/src/service/replies.vala +++ b/libdino/src/service/replies.vala @@ -1,9 +1,9 @@ using Gee; -using Qlite; using Xmpp; using Xmpp.Xep; using Dino.Entities; +using Dino.Qlite; public class Dino.Replies : StreamInteractionModule, Object { public static ModuleIdentity<Replies> IDENTITY = new ModuleIdentity<Replies>("reply"); diff --git a/libdino/src/service/search_processor.vala b/libdino/src/service/search_processor.vala index 2b5ebe49..aaec990a 100644 --- a/libdino/src/service/search_processor.vala +++ b/libdino/src/service/search_processor.vala @@ -1,8 +1,8 @@ using Gee; -using Xmpp; -using Qlite; using Dino.Entities; +using Dino.Qlite; +using Xmpp; namespace Dino { diff --git a/libdino/src/service/util.vala b/libdino/src/service/util.vala index e85e2005..ac596cad 100644 --- a/libdino/src/service/util.vala +++ b/libdino/src/service/util.vala @@ -1,5 +1,4 @@ using Dino.Entities; -using Qlite; namespace Dino { diff --git a/main/meson.build b/main/meson.build index 8b9404c9..3c15db32 100644 --- a/main/meson.build +++ b/main/meson.build @@ -8,7 +8,6 @@ dependencies = [ dep_icu_uc, dep_libadwaita, dep_m, - dep_qlite, dep_xmpp_vala, meson.get_compiler('vala').find_library('posix'), ] diff --git a/meson.build b/meson.build index b9df102b..ad0f7e4e 100644 --- a/meson.build +++ b/meson.build @@ -110,7 +110,6 @@ if get_option('set-install-rpath') default_install_rpath = get_option('prefix') / get_option('libdir') endif -subdir('qlite') subdir('xmpp-vala') subdir('libdino') subdir('main') diff --git a/plugins/ice/meson.build b/plugins/ice/meson.build index 5161b123..99f8e6a1 100644 --- a/plugins/ice/meson.build +++ b/plugins/ice/meson.build @@ -5,7 +5,6 @@ dependencies = [ dep_glib, dep_gmodule, dep_nice, - dep_qlite, dep_xmpp_vala, ] sources = files( diff --git a/plugins/notification-sound/meson.build b/plugins/notification-sound/meson.build index d6eebe18..80a1d062 100644 --- a/plugins/notification-sound/meson.build +++ b/plugins/notification-sound/meson.build @@ -4,7 +4,6 @@ dependencies = [ dep_glib, dep_gmodule, dep_libcanberra, - dep_qlite, dep_xmpp_vala, dep_gio, ] 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 { diff --git a/plugins/openpgp/meson.build b/plugins/openpgp/meson.build index 23588fca..56bc9d0c 100644 --- a/plugins/openpgp/meson.build +++ b/plugins/openpgp/meson.build @@ -7,7 +7,6 @@ dependencies = [ dep_gmodule, dep_gpgme, dep_gtk4, - dep_qlite, dep_xmpp_vala, ] sources = files( diff --git a/plugins/openpgp/src/database.vala b/plugins/openpgp/src/database.vala index fb575a3b..4c05571e 100644 --- a/plugins/openpgp/src/database.vala +++ b/plugins/openpgp/src/database.vala @@ -1,6 +1,5 @@ -using Qlite; - using Dino.Entities; +using Dino.Qlite; using Xmpp; namespace Dino.Plugins.OpenPgp { diff --git a/plugins/rtp/meson.build b/plugins/rtp/meson.build index b4ba5cf6..2772ad88 100644 --- a/plugins/rtp/meson.build +++ b/plugins/rtp/meson.build @@ -10,7 +10,6 @@ dependencies = [ dep_gstreamer_video, dep_gtk4, dep_m, - dep_qlite, dep_xmpp_vala, ] sources = files( diff --git a/qlite/meson.build b/qlite/meson.build deleted file mode 100644 index 162d6aa8..00000000 --- a/qlite/meson.build +++ /dev/null @@ -1,27 +0,0 @@ -dependencies = [ - dep_gee, - dep_glib, - dep_sqlite3, -] -sources = files( - 'src/column.vala', - 'src/database.vala', - 'src/delete_builder.vala', - 'src/insert_builder.vala', - 'src/query_builder.vala', - 'src/row.vala', - 'src/statement_builder.vala', - 'src/table.vala', - 'src/update_builder.vala', - 'src/upsert_builder.vala', -) -c_args = vala_c_args + [ - '-DG_LOG_DOMAIN="qlite"', -] -vala_args = [ - '--vapidir', meson.current_source_dir() / 'vapi', -] -lib_qlite = library('qlite', sources, c_args: c_args, vala_args: vala_args, dependencies: dependencies, version: '0.1', install: true, install_dir: [true, true, true], install_rpath: default_install_rpath) -dep_qlite = declare_dependency(link_with: lib_qlite, include_directories: include_directories('.')) - -install_data('qlite.deps', install_dir: get_option('datadir') / 'vala/vapi', install_tag: 'devel') # TODO: workaround for https://github.com/mesonbuild/meson/issues/9756 diff --git a/qlite/qlite.deps b/qlite/qlite.deps deleted file mode 100644 index d9b15e78..00000000 --- a/qlite/qlite.deps +++ /dev/null @@ -1,3 +0,0 @@ -gee-0.8 -glib-2.0 -sqlite3 |
