Commit d67fad1c authored by Sébastien Blin's avatar Sébastien Blin

misc: fix build warnings

Change-Id: I1c42d6dc90d60f2d0c5d2aa4451c1be03e7d17cd
Gitlab: #408
parent 13274dea
......@@ -817,7 +817,7 @@ AVModelPimpl::getDevice(int type) const
}
auto deviceIdx = currentDevicesIdx[type].toUInt();
for (const auto& dev : devices) {
int idx;
uint32_t idx;
switch (type) {
case 1: // INPUT
idx = ConfigurationManager::instance().getAudioInputDeviceIndex(dev.c_str());
......
......@@ -434,6 +434,8 @@ CallbacksHandler::slotDataTransferEvent(qulonglong dringId, uint codeStatus)
case DRing::DataTransferEventCode::unjoinable_peer:
emit transferStatusUnjoinable(static_cast<long long>(dringId), info);
break;
case DRing::DataTransferEventCode::invalid:
break;
}
}
......
......@@ -336,6 +336,9 @@ ConversationModel::allFilteredConversations() const
return false;
case profile::Type::TEMPORARY:
return filterUriAndReg(contactInfo, filter);
case profile::Type::SIP:
case profile::Type::RING:
break;
}
} else {
// We only want pending requests matching with the filter
......@@ -457,6 +460,7 @@ ConversationModel::selectConversation(const std::string& uid) const
// call just ended
emit pimpl_->behaviorController.showChatView(owner.id, conversation);
break;
case call::Status::ENDED:
default: // ENDED
// nothing to do
break;
......@@ -1706,6 +1710,9 @@ ConversationModelPimpl::slotUpdateInteractionStatus(const std::string& accountId
case DRing::Account::MessageStates::SENDING:
newStatus = interaction::Status::SENDING;
break;
case DRing::Account::MessageStates::CANCELLED:
newStatus = interaction::Status::TRANSFER_CANCELED;
break;
case DRing::Account::MessageStates::SENT:
newStatus = interaction::Status::SUCCEED;
break;
......@@ -1878,7 +1885,7 @@ ConversationModel::getNumberOfUnreadMessagesFor(const std::string& convUid)
}
bool
ConversationModelPimpl::usefulDataFromDataTransfer(long long dringId, const datatransfer::Info& info,
ConversationModelPimpl::usefulDataFromDataTransfer(long long dringId, const datatransfer::Info&,
int& interactionId, std::string& convId)
{
try {
......
......@@ -256,7 +256,7 @@ Database::getVersion()
auto getVersionQuery = std::string("pragma user_version");
if (not query.exec(getVersionQuery.c_str()))
throw QueryError(query);
query.first();
query.first();
return query.value(0).toString().toStdString();
}
......@@ -346,7 +346,7 @@ Database::select(const std::string& select, // "id",
result.payloads.emplace_back(query.value(i).toString().toStdString());
}
return std::move(result);
return result;
}
int
......
......@@ -140,7 +140,7 @@ Renderer::useAVFrame(bool useAVFrame) {
pimpl_->usingAVFrame_ = useAVFrame;
#ifdef ENABLE_LIBWRAP
pimpl_->renderer->configureTarget(useAVFrame);
#endif;
#endif
}
std::string
......
......@@ -63,7 +63,7 @@ struct SHMHeader {
unsigned writeOffset ; /*!< offset of writable frame in data */
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-pedantic"
#pragma GCC diagnostic ignored "-Wpedantic"
uint8_t data[] ; /*!< the whole shared memory */
#pragma GCC diagnostic pop
};
......
......@@ -410,7 +410,7 @@ void URIPimpl::parseHostname()
} else {
if (section == URI::Section::HOSTNAME) {
m_Hostname2 = extHn.mid(start+1,i-start);
} else if (section == URI::Section::HOSTNAME) {
} else if (section == URI::Section::PORT) {
m_Port = extHn.mid(start+1,i-start-1).toInt();
}
inAttributes = true;
......@@ -477,6 +477,7 @@ QString URI::format(FlagPack<URI::Section> sections) const
case ProtocolHint::IP:
header_type = SchemeType::SIP;
break;
case ProtocolHint::UNRECOGNIZED:
default:
header_type = SchemeType::RING;
break;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment