forked from Ivasoft/DSView
Fix some compile warnings
This commit is contained in:
@@ -24,6 +24,9 @@
|
||||
|
||||
#include <map>
|
||||
#include <set>
|
||||
#include <string>
|
||||
#include <sstream>
|
||||
#include <iostream>
|
||||
|
||||
#include <boost/shared_ptr.hpp>
|
||||
|
||||
|
||||
@@ -32,6 +32,8 @@ SignalData::SignalData() :
|
||||
{
|
||||
}
|
||||
|
||||
SignalData::~SignalData() {}
|
||||
|
||||
double SignalData::samplerate() const
|
||||
{
|
||||
return _samplerate;
|
||||
|
||||
@@ -34,7 +34,7 @@ class SignalData
|
||||
{
|
||||
public:
|
||||
SignalData();
|
||||
|
||||
virtual ~SignalData() = 0;
|
||||
public:
|
||||
double samplerate() const;
|
||||
void set_samplerate(double samplerate);
|
||||
|
||||
@@ -45,7 +45,7 @@ const QString Calibration::VCOMB = QT_TR_NOOP(" VCOMB");
|
||||
Calibration::Calibration(QWidget *parent) :
|
||||
DSDialog(parent)
|
||||
{
|
||||
#ifdef Q_OS_OSX
|
||||
#ifdef Q_OS_DARWIN
|
||||
Qt::WindowFlags flags = windowFlags();
|
||||
this->setWindowFlags(flags | Qt::Tool);
|
||||
#endif
|
||||
|
||||
@@ -50,7 +50,7 @@ XCursor::XCursor(View &view, QColor &colour,
|
||||
const std::vector< boost::shared_ptr<Signal> > sigs(_view.session().get_signals());
|
||||
BOOST_FOREACH(const boost::shared_ptr<Signal> s, sigs) {
|
||||
boost::shared_ptr<DsoSignal> dsoSig;
|
||||
if (dsoSig = dynamic_pointer_cast<DsoSignal>(s))
|
||||
if ((dsoSig = dynamic_pointer_cast<DsoSignal>(s)))
|
||||
if (dsoSig->enabled()) {
|
||||
_dsoSig = dsoSig;
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user