1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-04-28 02:14:03 -04:00

MSVC compatibility

This commit is contained in:
f4exb 2020-03-15 11:58:19 +01:00
parent f77f61a8a5
commit 298a5aadc5
10 changed files with 13 additions and 13 deletions

View File

@ -167,7 +167,6 @@ private:
private slots:
void handleInputMessages();
void networkManagerFinished(QNetworkReply *reply);
void handleData(int start, int stop);
};
#endif // INCLUDE_BEAMSTEERINGCWSOURCE_H

View File

@ -15,6 +15,9 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
///////////////////////////////////////////////////////////////////////////////////
#define _USE_MATH_DEFINES
#include <math.h>
#include "dsp/dsptypes.h"
#include "beamsteeringcwmodstreamsource.h"

View File

@ -171,7 +171,6 @@ private:
private slots:
void handleInputMessages();
void networkManagerFinished(QNetworkReply *reply);
void handleData(int start, int stop);
};
#endif // INCLUDE_INTERFEROMETER_H

View File

@ -53,10 +53,6 @@ public:
virtual MessageQueue* getInputMessageQueue();
virtual bool handleMessage(const Message& message);
public slots:
void channelMarkerChangedByCursor();
void channelMarkerHighlightedByCursor();
private:
Ui::InterferometerGUI* ui;
PluginAPI* m_pluginAPI;
@ -95,7 +91,6 @@ private slots:
void on_correlationType_currentIndexChanged(int index);
void onWidgetRolled(QWidget* widget, bool rollDown);
void onMenuDialogCalled(const QPoint& p);
void handleInputMessages();
void tick();
};

View File

@ -176,7 +176,7 @@ public:
const QStringList& deviceSettingsKeys,
SWGSDRangel::SWGDeviceSettings& response);
bool isRecording(unsigned int istream) const;
bool isRecording(unsigned int istream) const { (void) istream; return false; }
void getRxFrequencyRange(uint64_t& min, uint64_t& max, int& step);
void getRxSampleRateRange(int& min, int& max, int& step);

View File

@ -94,7 +94,6 @@ BladeRF2MIMOGui::BladeRF2MIMOGui(DeviceUISet *deviceUISet, QWidget* parent) :
m_sampleMIMO->setMessageQueueToGUI(&m_inputMessageQueue);
CRightClickEnabler *startStopRightClickEnabler = new CRightClickEnabler(ui->startStopRx);
connect(startStopRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(openDeviceSettingsDialog(const QPoint &)));
sendSettings();
}

View File

@ -98,7 +98,6 @@ private slots:
void handleInputMessages();
void updateHardware();
void updateStatus();
void openDeviceSettingsDialog(const QPoint& p);
void on_streamSide_currentIndexChanged(int index);
void on_streamIndex_currentIndexChanged(int index);
void on_spectrumSide_currentIndexChanged(int index);

View File

@ -15,6 +15,8 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
///////////////////////////////////////////////////////////////////////////////////
#include <algorithm>
#include "bladerf2/devicebladerf2shared.h"
#include "dsp/samplemififo.h"
@ -144,7 +146,7 @@ void BladeRF2MIThread::callback(const qint16* buf, qint32 samplesPerChannel)
else
{
qWarning("BladeRF2MIThread::callback: unequal channel lengths: [0]=%d [1]=%d", lengths[0], lengths[1]);
m_sampleFifo->writeSync(vbegin, std::min(lengths[0], lengths[1]));
m_sampleFifo->writeSync(vbegin, (std::min)(lengths[0], lengths[1]));
}
}

View File

@ -18,7 +18,9 @@
#include <stdint.h>
class DeviceSampleStatic
#include "export.h"
class SDRBASE_API DeviceSampleStatic
{
public:
typedef enum {

View File

@ -20,7 +20,9 @@
#include <QTextEdit>
class CustomTextEdit : public QTextEdit
#include "export.h"
class SDRGUI_API CustomTextEdit : public QTextEdit
{
Q_OBJECT
public: