Consistently use the interface type of the library.

4 files changed, 66 insertions, 1 deletions

diff --git a/math/fityk/distinfo b/math/fityk/distinfo
index f14576d27a2..0b64ed9251f 100644
--- a/math/fityk/distinfo
+++ b/math/fityk/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2015/11/03 23:33:33 agc Exp $
+$NetBSD: distinfo,v 1.8 2020/04/20 00:41:04 joerg Exp $
 
 SHA1 (fityk-0.9.7.tar.bz2) = bb4d11b529c6c87c68c6f7359075915caf95a996
 RMD160 (fityk-0.9.7.tar.bz2) = bd403037157b32ec7c7c6972f17116e403d099bc
@@ -7,6 +7,9 @@ Size (fityk-0.9.7.tar.bz2) = 1146628 bytes
 SHA1 (patch-aa) = c923919db013ca9ddb8370617bf0b4b0aaa31922
 SHA1 (patch-src_GAfit.cpp) = 6543899d3861853d0738bbb5ced2cc9f59fda6db
 SHA1 (patch-src_common.h) = 1ab3f9d0c72c1f4bb0740a22ccc7960fb18b4c90
+SHA1 (patch-src_data.cpp) = b3aa6c9561a117b93e0447786c9fb4ca50d9438f
 SHA1 (patch-src_eparser.cpp) = 6120b71f1bcafc1efc5b774426955084739a42c0
 SHA1 (patch-src_guess.cpp) = 2379b3bc3de4d24a8c5a2781c27b8eeccbb516c2
 SHA1 (patch-src_wxgui_ceria.cpp) = d3d07180b20b563c67d1bb7316d38ef64ff91a8a
+SHA1 (patch-src_wxgui_dload.cpp) = 08df6c1d5d7cc859927e452450379363710f0a0a
+SHA1 (patch-src_wxgui_frame.cpp) = d3b24c7babb143f0a4e50186b418c45e908e26de
diff --git a/math/fityk/patches/patch-src_data.cpp b/math/fityk/patches/patch-src_data.cpp
new file mode 100644
index 00000000000..29f3874997b
--- /dev/null
+++ b/math/fityk/patches/patch-src_data.cpp
@@ -0,0 +1,31 @@
+$NetBSD: patch-src_data.cpp,v 1.1 2020/04/20 00:41:04 joerg Exp $
+
+--- src/data.cpp.orig	2020-04-19 19:03:20.044364446 +0000
++++ src/data.cpp
+@@ -307,7 +307,7 @@ static string tr_opt(string options)
+ int Data::count_blocks(string const& fn,
+                        string const& format, string const& options)
+ {
+-    shared_ptr<const xylib::DataSet> xyds(
++    dataset_shared_ptr xyds(
+                         xylib::cached_load_file(fn, format, tr_opt(options)));
+     return xyds->get_block_count();
+ }
+@@ -316,7 +316,7 @@ int Data::count_columns(string const& fn
+                         string const& format, string const& options,
+                         int first_block)
+ {
+-    shared_ptr<const xylib::DataSet> xyds(
++    dataset_shared_ptr xyds(
+                         xylib::cached_load_file(fn, format, tr_opt(options)));
+     return xyds->get_block(first_block)->get_column_count();
+ }
+@@ -332,7 +332,7 @@ void Data::load_file (string const& fn,
+ 
+     string block_name;
+     try {
+-        shared_ptr<const xylib::DataSet> xyds(
++        dataset_shared_ptr xyds(
+                         xylib::cached_load_file(fn, format, tr_opt(options)));
+         clear(); //removing previous file
+         vector<int> bb = blocks.empty() ? vector1(0) : blocks;
diff --git a/math/fityk/patches/patch-src_wxgui_dload.cpp b/math/fityk/patches/patch-src_wxgui_dload.cpp
new file mode 100644
index 00000000000..883e15dd56c
--- /dev/null
+++ b/math/fityk/patches/patch-src_wxgui_dload.cpp
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_wxgui_dload.cpp,v 1.1 2020/04/20 00:41:04 joerg Exp $
+
+--- src/wxgui/dload.cpp.orig	2020-04-19 19:06:47.672823533 +0000
++++ src/wxgui/dload.cpp
+@@ -53,11 +53,11 @@ public:
+     void draw(wxDC &dc, bool);
+     void load_dataset(string const& filename, string const& filetype,
+                       string const& options);
+-    shared_ptr<const xylib::DataSet> get_data() const { return data; }
++    dataset_shared_ptr get_data() const { return data; }
+     void make_outdated() { data_updated = false; }
+ 
+ private:
+-    shared_ptr<const xylib::DataSet> data;
++    dataset_shared_ptr data;
+     bool data_updated; // if false, draw() doesn't do anything (plot is clear)
+ };
+ 
diff --git a/math/fityk/patches/patch-src_wxgui_frame.cpp b/math/fityk/patches/patch-src_wxgui_frame.cpp
new file mode 100644
index 00000000000..e7870ede462
--- /dev/null
+++ b/math/fityk/patches/patch-src_wxgui_frame.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_wxgui_frame.cpp,v 1.1 2020/04/20 00:41:04 joerg Exp $
+
+--- src/wxgui/frame.cpp.orig	2020-04-19 19:08:09.074623963 +0000
++++ src/wxgui/frame.cpp
+@@ -919,7 +919,7 @@ void FFrame::OnDataQLoad (wxCommandEvent
+     string cmd;
+     if (count == 1) {
+         string f = wx2s(paths[0]);
+-        shared_ptr<const xylib::DataSet> d = xylib::cached_load_file(f, "", "");
++        dataset_shared_ptr d = xylib::cached_load_file(f, "", "");
+         if (d->get_block_count() > 1) {
+             wxArrayString choices;
+             for (int i = 0; i < d->get_block_count(); ++i) {