From dc3263c04c3c538d38033fc750d2a5a06bb334a5 Mon Sep 17 00:00:00 2001 From: DreamSourceLab Date: Tue, 15 Dec 2015 00:34:13 +0800 Subject: [PATCH] Fix compile warnings --- DSView/pv/dock/triggerdock.cpp | 1 - DSView/pv/toolbars/samplingbar.cpp | 6 ------ DSView/pv/view/dsosignal.cpp | 18 +++++++++--------- DSView/pv/view/header.cpp | 1 - INSTALL | 2 +- 5 files changed, 10 insertions(+), 18 deletions(-) diff --git a/DSView/pv/dock/triggerdock.cpp b/DSView/pv/dock/triggerdock.cpp index b997386c..aea64b19 100644 --- a/DSView/pv/dock/triggerdock.cpp +++ b/DSView/pv/dock/triggerdock.cpp @@ -267,7 +267,6 @@ void TriggerDock::paintEvent(QPaintEvent *) void TriggerDock::simple_trigger() { - int i; stages_label->setDisabled(true); stages_comboBox->setDisabled(true); _adv_tabWidget->setDisabled(true); diff --git a/DSView/pv/toolbars/samplingbar.cpp b/DSView/pv/toolbars/samplingbar.cpp index a9c34f1e..85b45603 100644 --- a/DSView/pv/toolbars/samplingbar.cpp +++ b/DSView/pv/toolbars/samplingbar.cpp @@ -494,8 +494,6 @@ void SamplingBar::commit_sample_rate() void SamplingBar::on_samplecount_sel(int index) { uint64_t sample_count = 0; - uint64_t max_sample_count = 0; - bool stream_mode = false; qDebug() << "index: " << index; if (index >= 0) @@ -520,10 +518,6 @@ void SamplingBar::on_samplecount_sel(int index) void SamplingBar::on_samplerate_sel(int index) { uint64_t sample_rate = 0; - //uint64_t last_sample_rate = 0; - uint64_t max_sample_count = 0; - uint64_t sample_count = 0; - bool stream_mode = false; if (index >= 0) sample_rate = _sample_rate.itemData( diff --git a/DSView/pv/view/dsosignal.cpp b/DSView/pv/view/dsosignal.cpp index 11dff4d3..de5e0bbf 100644 --- a/DSView/pv/view/dsosignal.cpp +++ b/DSView/pv/view/dsosignal.cpp @@ -426,15 +426,15 @@ bool DsoSignal::load_settings() GVariant* gvar; // -- enable - bool enable; - gvar = _dev_inst->get_config(_probe, NULL, SR_CONF_EN_CH); - if (gvar != NULL) { - enable = g_variant_get_boolean(gvar); - g_variant_unref(gvar); - } else { - qDebug() << "ERROR: config_get SR_CONF_EN_CH failed."; - return false; - } + //bool enable; + //gvar = _dev_inst->get_config(_probe, NULL, SR_CONF_EN_CH); + //if (gvar != NULL) { + // enable = g_variant_get_boolean(gvar); + // g_variant_unref(gvar); + //} else { + // qDebug() << "ERROR: config_get SR_CONF_EN_CH failed."; + // return false; + //} // -- hdiv uint64_t hdiv; diff --git a/DSView/pv/view/header.cpp b/DSView/pv/view/header.cpp index 2a83f6c0..e6d20c37 100644 --- a/DSView/pv/view/header.cpp +++ b/DSView/pv/view/header.cpp @@ -140,7 +140,6 @@ void Header::mouseDoubleClickEvent(QMouseEvent *event) const vector< boost::shared_ptr > traces( _view.get_traces()); - int action; if (event->button() & Qt::LeftButton) { _mouse_down_point = event->pos(); diff --git a/INSTALL b/INSTALL index a75cb551..1ac01f09 100644 --- a/INSTALL +++ b/INSTALL @@ -49,7 +49,7 @@ Arch: Step2: Get the DSView source code - $ clone git://github.com/DreamSourceLab/DSView + $ git clone git://github.com/DreamSourceLab/DSView Step3: Building