Fixed compilation errors

pull/127/head
f4exb 2017-12-14 21:03:11 +01:00
rodzic 731c2c3f60
commit f7733a49fc
5 zmienionych plików z 16 dodań i 4 usunięć

Wyświetl plik

@ -1,5 +1,7 @@
project(filesink)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
set(filesink_SOURCES
filesinkgui.cpp
filesinkoutput.cpp
@ -23,6 +25,7 @@ set(filesink_FORMS
include_directories(
.
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
)
add_definitions(${QT_DEFINITIONS})
@ -41,6 +44,7 @@ target_link_libraries(outputfilesink
${QT_LIBRARIES}
sdrbase
sdrgui
swagger
)
qt5_use_modules(outputfilesink Core Widgets)

Wyświetl plik

@ -1,5 +1,7 @@
project(fcdpro)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
set(fcdpro_SOURCES
fcdprogui.cpp
fcdproinput.cpp
@ -23,6 +25,7 @@ set(fcdpro_FORMS
include_directories(
.
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
${CMAKE_SOURCE_DIR}/fcdhid
${CMAKE_SOURCE_DIR}/fcdlib
)
@ -48,6 +51,7 @@ target_link_libraries(inputfcdpro
fcdlib
sdrbase
sdrgui
swagger
)
qt5_use_modules(inputfcdpro Core Widgets)

Wyświetl plik

@ -210,9 +210,9 @@ bool FCDProGui::deserialize(const QByteArray& data)
bool FCDProGui::handleMessage(const Message& message __attribute__((unused)))
{
if (BladerfInput::MsgStartStop::match(message))
if (FCDProInput::MsgStartStop::match(message))
{
BladerfInput::MsgStartStop& notif = (BladerfInput::MsgStartStop&) message;
FCDProInput::MsgStartStop& notif = (FCDProInput::MsgStartStop&) message;
blockApplySettings(true);
ui->startStop->setChecked(notif.getStartStop());
blockApplySettings(false);
@ -449,7 +449,7 @@ void FCDProGui::on_startStop_toggled(bool checked)
{
if (m_doApplySettings)
{
BladerfInput::MsgStartStop *message = BladerfInput::MsgStartStop::create(checked);
FCDProInput::MsgStartStop *message = FCDProInput::MsgStartStop::create(checked);
m_sampleSource->getInputMessageQueue()->push(message);
}
}

Wyświetl plik

@ -1,5 +1,7 @@
project(fcdproplus)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
set(fcdproplus_SOURCES
fcdproplusgui.cpp
fcdproplusinput.cpp
@ -23,6 +25,7 @@ set(fcdproplus_FORMS
include_directories(
.
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
${CMAKE_SOURCE_DIR}/fcdhid
${CMAKE_SOURCE_DIR}/fcdlib
)
@ -48,6 +51,7 @@ target_link_libraries(inputfcdproplus
fcdlib
sdrbase
sdrgui
swagger
)
qt5_use_modules(inputfcdproplus Core Widgets)

Wyświetl plik

@ -314,7 +314,7 @@ void FCDProPlusGui::on_startStop_toggled(bool checked)
{
if (m_doApplySettings)
{
BladerfInput::MsgStartStop *message = BladerfInput::MsgStartStop::create(checked);
FCDProPlusInput::MsgStartStop *message = FCDProPlusInput::MsgStartStop::create(checked);
m_sampleSource->getInputMessageQueue()->push(message);
}
}