[niepce: 29/29] Phase 1 of Rustification: Library is now implemented in Rust.
- From: Hubert Figuière <hub src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [niepce: 29/29] Phase 1 of Rustification: Library is now implemented in Rust.
- Date: Fri, 22 Sep 2017 00:44:09 +0000 (UTC)
commit ce6d10405cecd40953e2bbc6e90c202cafebf585
Merge: ee3965e d8f729f
Author: Hubert Figuière <hub figuiere net>
Date: Thu Sep 21 20:37:50 2017 -0400
Phase 1 of Rustification: Library is now implemented in Rust.
Merge branch 'rustification'
.clang-format | 20 +-
.gitignore | 7 +-
Cargo.toml | 21 +
Makefile.am | 5 +-
README | 1 +
build.rs | 70 ++
camerawire/src/Makefile.am | 2 +
configure.ac | 20 +-
src/engine/Makefile.am | 25 +-
src/engine/db/bindings.hpp | 10 +
src/engine/db/filebundle.cpp | 91 +--
src/engine/db/filebundle.hpp | 52 +-
src/engine/db/filebundle.rs | 171 ++++
src/engine/db/fsfile.hpp | 58 --
src/engine/db/{storage.hpp => fsfile.rs} | 51 +-
src/engine/db/keyword.cpp | 17 +-
src/engine/db/keyword.hpp | 36 +-
src/engine/db/keyword.rs | 85 ++
.../t/testfractions.cpp => engine/db/label.cpp} | 29 +-
src/engine/db/label.hpp | 54 +-
src/engine/db/label.rs | 116 +++
src/engine/db/libfile.cpp | 120 +--
src/engine/db/libfile.hpp | 135 +--
src/engine/db/libfile.rs | 315 ++++++
src/engine/db/libfolder.cpp | 27 +-
src/engine/db/libfolder.hpp | 76 +--
src/engine/db/libfolder.rs | 169 ++++
src/engine/db/libmetadata.cpp | 285 ++----
src/engine/db/libmetadata.hpp | 56 +-
src/engine/db/libmetadata.rs | 182 ++++
src/engine/db/library.cpp | 996 +-------------------
src/engine/db/library.hpp | 197 +----
src/engine/db/library.rs | 928 ++++++++++++++++++
src/engine/db/{fsfile.cpp => mod.rs} | 46 +-
src/engine/db/properties-def.hpp | 2 +-
src/engine/db/properties-enum.hpp | 22 +
src/engine/db/properties.hpp | 19 +-
src/engine/db/test_filebundle.cpp | 18 +-
src/engine/db/test_library.cpp | 108 ---
src/engine/importer/cameraimporter.cpp | 4 +-
src/engine/importer/directoryimporter.cpp | 2 +-
src/engine/importer/iimporter.hpp | 2 +-
src/engine/library/commands.cpp | 226 -----
src/engine/library/commands.hpp | 75 +-
src/engine/library/commands.rs | 239 +++++
src/engine/library/mod.rs | 4 +
src/engine/library/notification.cpp | 56 ++
src/engine/library/notification.hpp | 226 ++---
src/engine/library/notification.rs | 203 ++++
src/engine/library/op.cpp | 4 +-
src/engine/library/op.hpp | 10 +-
src/engine/library/test_opqueue.cpp | 2 +-
src/engine/library/thumbnailcache.cpp | 31 +-
src/engine/library/thumbnailcache.hpp | 14 +-
src/engine/{db/storage.cpp => mod.rs} | 16 +-
src/fwk/base/Makefile.am | 10 +-
src/fwk/base/colour.cpp | 73 +-
src/fwk/base/colour.hpp | 35 +-
src/fwk/base/date.cpp | 31 +-
src/fwk/base/date.hpp | 32 +-
src/fwk/base/date.rs | 165 ++++
src/fwk/base/debug.rs | 38 +
src/fwk/base/fractions.cpp | 54 --
src/fwk/base/fractions.hpp | 7 +-
src/fwk/base/fractions.rs | 57 ++
src/{engine/db/fsfile.cpp => fwk/base/mod.rs} | 32 +-
src/fwk/base/propertybag.cpp | 36 +
src/fwk/base/propertybag.hpp | 43 +-
src/fwk/base/rgbcolour.rs | 106 +++
src/fwk/base/rust.hpp | 12 +
src/fwk/base/t/testpropertybag.cpp | 2 +-
src/fwk/mod.rs | 68 ++
src/fwk/toolkit/gdkutils.cpp | 9 +-
src/fwk/toolkit/gdkutils.hpp | 2 +-
src/fwk/toolkit/metadatawidget.cpp | 12 +-
src/fwk/toolkit/mimetype.cpp | 28 +-
src/fwk/toolkit/mimetype.hpp | 12 +-
src/fwk/toolkit/mimetype.rs | 121 +++
src/fwk/toolkit/mod.rs | 2 +
src/fwk/toolkit/notificationcenter.cpp | 25 +-
src/fwk/toolkit/notificationcenter.hpp | 10 +-
src/fwk/utils/Makefile.am | 32 +-
src/fwk/utils/db/Makefile.am | 3 -
src/fwk/utils/db/iconnectiondriver.hpp | 122 ---
src/fwk/utils/db/iconnectionmanagerdriver.hpp | 106 ---
src/fwk/utils/db/insertstatement.cpp | 115 ---
src/fwk/utils/db/insertstatement.hpp | 61 --
src/fwk/utils/db/sqlite/Makefile.am | 4 -
src/fwk/utils/db/sqlite/sqlitecnxdrv.cpp | 587 ------------
src/fwk/utils/db/sqlite/sqlitecnxdrv.hpp | 113 ---
src/fwk/utils/db/sqlite/sqlitecnxmgrdrv.cpp | 156 ---
src/fwk/utils/db/sqlite/sqlitecnxmgrdrv.hpp | 60 --
src/fwk/utils/db/sqlstatement.cpp | 133 ---
src/fwk/utils/db/sqlstatement.hpp | 138 ---
src/fwk/utils/db/test_db.cpp | 56 --
src/fwk/utils/db/test_db2.cpp | 58 --
src/fwk/utils/db/test_db3.cpp | 83 --
src/fwk/utils/db/test_db4.cpp | 62 --
src/fwk/utils/exempi.cpp | 315 +------
src/fwk/utils/exempi.hpp | 65 +-
src/fwk/utils/exempi.rs | 395 ++++++++
src/fwk/utils/files.cpp | 16 +
src/fwk/utils/files.hpp | 27 +-
src/{engine/db/storage.cpp => fwk/utils/mod.rs} | 15 +-
src/fwk/utils/testxmp.cpp | 34 -
src/{engine/db/fsfile.cpp => lib.rs} | 37 +-
src/libraryclient/Makefile.am | 6 +-
src/libraryclient/clientimpl.cpp | 81 +-
src/libraryclient/clientimpl.hpp | 10 +-
src/libraryclient/libraryclient.cpp | 12 +-
src/libraryclient/libraryclient.hpp | 10 +-
src/libraryclient/locallibraryserver.cpp | 3 +-
src/libraryclient/locallibraryserver.hpp | 20 +-
src/libraryclient/test_worker.cpp | 4 +-
src/libraryclient/uidataprovider.cpp | 28 +-
src/libraryclient/uidataprovider.hpp | 15 +-
src/niepce/Makefile.am | 48 +-
src/niepce/main.cpp | 2 +-
src/niepce/modules/darkroom/darkroommodule.cpp | 16 +-
src/niepce/modules/darkroom/darkroommodule.hpp | 4 +-
.../modules/interfaces/ipostimportprocessing.hpp | 2 +-
src/niepce/modules/map/mapmodule.cpp | 16 +-
src/niepce/notificationcenter.cpp | 11 +-
src/niepce/notificationcenter.hpp | 13 +-
src/niepce/ui/dialogs/editlabels.cpp | 15 +-
src/niepce/ui/dialogs/editlabels.hpp | 2 +-
src/niepce/ui/filmstripcontroller.cpp | 4 +-
src/niepce/ui/gridviewmodule.cpp | 26 +-
src/niepce/ui/imageliststore.cpp | 52 +-
src/niepce/ui/imageliststore.hpp | 3 +-
src/niepce/ui/librarycellrenderer.cpp | 38 +-
src/niepce/ui/librarycellrenderer.hpp | 6 +-
src/niepce/ui/metadatapanecontroller.cpp | 4 +-
src/niepce/ui/metadatapanecontroller.hpp | 2 +-
src/niepce/ui/niepcewindow.cpp | 54 +-
src/niepce/ui/niepcewindow.hpp | 1 +
src/niepce/ui/selectioncontroller.cpp | 40 +-
src/niepce/ui/selectioncontroller.hpp | 6 +-
src/niepce/ui/workspacecontroller.cpp | 75 +-
src/niepce/ui/workspacecontroller.hpp | 6 +-
140 files changed, 4816 insertions(+), 5390 deletions(-)
---
diff --cc src/niepce/ui/imageliststore.cpp
index 83c4c95,b14bb32..c367dac
--- a/src/niepce/ui/imageliststore.cpp
+++ b/src/niepce/ui/imageliststore.cpp
@@@ -107,8 -107,8 +107,8 @@@ void ImageListStore::on_lib_notificatio
// clear the map before the list.
m_idmap.clear();
clear();
- for_each(l->begin(), l->end(),
+ for_each(l->cbegin(), l->cend(),
- [this](const eng::LibFile::Ptr & f) {
+ [this] (const eng::LibFilePtr & f) {
Gtk::TreeModel::iterator riter = append();
Gtk::TreeRow row = *riter;
Glib::RefPtr<Gdk::Pixbuf> icon = get_loading_icon();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]