quick fix to compile DSLogic-gui on Debian sid

DSLogic.Debian-sid-compile-fix.diff

commit 6e45af595937ed9a91d97f2490278844516bde3d
Author: Dobrica Pavlinusic <dpavlin@rot13.org>
Date:   Fri Jan 10 19:07:11 2014 +0100

    git compile on Debian sid fix

diff --git a/DSLogic-gui/CMakeLists.txt b/DSLogic-gui/CMakeLists.txt
index 5a4fb8f..748f2f0 100644
--- a/DSLogic-gui/CMakeLists.txt
+++ b/DSLogic-gui/CMakeLists.txt
@@ -28,7 +28,7 @@ project(DSLogic-gui)
 #= User Options
 #-------------------------------------------------------------------------------
 
-option(DISABLE_WERROR "Build without -Werror" FALSE)
+option(DISABLE_WERROR "Build without -Werror" TRUE)
 option(ENABLE_SIGNALS "Build with UNIX signals" TRUE)
 option(ENABLE_TESTS "Enable unit tests" FALSE)
 option(STATIC_PKGDEPS_LIBS "Statically link to (pkgconfig) libraries" FALSE)
diff --git a/DSLogic-gui/pv/decoder/dsserial.cpp b/DSLogic-gui/pv/decoder/dsserial.cpp
index 5b23186..44187ae 100644
--- a/DSLogic-gui/pv/decoder/dsserial.cpp
+++ b/DSLogic-gui/pv/decoder/dsserial.cpp
@@ -117,7 +117,7 @@ void dsSerial::decode()
     uint64_t left = 0;
     uint64_t right = snapshot->get_sample_count() - 1;
     float samplesPerBit;
-    int sampleOffset;
+//    int sampleOffset = 0;
     int i;
     _max_width = 0;
     _min_width = right;
@@ -127,7 +127,8 @@ void dsSerial::decode()
         samplesPerBit = _data->get_samplerate() * 1.0f / _baudrate;
     else
         samplesPerBit = snapshot->get_min_pulse(left, right, _serial_index);
-    sampleOffset = samplesPerBit / 2;
+
+//    sampleOffset = samplesPerBit / 2;
 
     if (!_state_index.empty())
         _state_index.clear();
diff --git a/DSLogic-gui/pv/sigsession.cpp b/DSLogic-gui/pv/sigsession.cpp
index 684f346..8ea5eac 100644
--- a/DSLogic-gui/pv/sigsession.cpp
+++ b/DSLogic-gui/pv/sigsession.cpp
@@ -992,7 +992,7 @@ void SigSession::rst_protocol_analyzer(int rst_index, std::list <int > _sel_prob
 void SigSession::del_protocol_analyzer(int protocol_index)
 {
     assert(protocol_index < _decoders.size());
-    delete (_decoders.at(protocol_index)).first;
+//    delete (_decoders.at(protocol_index)).first;
 
 //    BOOST_FOREACH(const int _index, (_decoders.at(protocol_index)).second) {
 //        _signals.at(_index)->del_decoder();
diff --git a/DSLogic-gui/pv/toolbars/samplingbar.cpp b/DSLogic-gui/pv/toolbars/samplingbar.cpp
index 9c5c2bb..128b0d7 100644
--- a/DSLogic-gui/pv/toolbars/samplingbar.cpp
+++ b/DSLogic-gui/pv/toolbars/samplingbar.cpp
@@ -174,7 +174,7 @@ void SamplingBar::update_sample_rate_selector()
 	GVariant *gvar_dict, *gvar_list;
 	const uint64_t *elements = NULL;
 	gsize num_elements;
-	QAction *selector_action = NULL;
+//	QAction *selector_action = NULL;
 
 	assert(_sample_rate_list_action);
 
@@ -205,7 +205,7 @@ void SamplingBar::update_sample_rate_selector()
 		_sample_rate_list.show();
 		g_variant_unref(gvar_list);
 
-		selector_action = _sample_rate_list_action;
+//		selector_action = _sample_rate_list_action;
 	}
 
 	g_variant_unref(gvar_dict);