Don't use std:: in the code directly (where possible).

[pulseview.git] / pv / dialogs / storeprogress.cpp

diff --git a/pv/dialogs/storeprogress.cpp b/pv/dialogs/storeprogress.cpp
index b041dcdb1508455576399f824121c8598db743c8..4ef3404594ecc1a26100e90add78cd5653fef543 100644 (file)
--- a/pv/dialogs/storeprogress.cpp
+++ b/pv/dialogs/storeprogress.cpp
@@ -14,26 +14,40 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <cassert>
 
 #include <QMessageBox>
 
+#include "pv/session.hpp"
+
 #include "storeprogress.hpp"
 
+using std::map;
+using std::pair;
+using std::shared_ptr;
+using std::string;
+
+using Glib::VariantBase;
+
 namespace pv {
 namespace dialogs {
 
 StoreProgress::StoreProgress(const QString &file_name,
+       const shared_ptr<sigrok::OutputFormat> output_format,
+       const map<string, VariantBase> &options,
+       const pair<uint64_t, uint64_t> sample_range,
        const Session &session, QWidget *parent) :
        QProgressDialog(tr("Saving..."), tr("Cancel"), 0, 0, parent),
-       session_(file_name.toStdString(), session)
+       session_(file_name.toStdString(), output_format, options, sample_range,
+               session)
 {
        connect(&session_, SIGNAL(progress_updated()),
                this, SLOT(on_progress_updated()));
+       connect(&session_, SIGNAL(store_successful()),
+               &session, SLOT(on_data_saved()));
 }
 
 StoreProgress::~StoreProgress()
@@ -66,7 +80,7 @@ void StoreProgress::closeEvent(QCloseEvent*)
 
 void StoreProgress::on_progress_updated()
 {
-       const std::pair<int, int> p = session_.progress();
+       const pair<int, int> p = session_.progress();
        assert(p.first <= p.second);
 
        if (p.second) {