1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

Fix inconsistent noexcept in toxcall.cpp

This commit is contained in:
tux3 2015-11-06 01:49:54 +01:00
parent a853d51f5b
commit b4754c6ac2
No known key found for this signature in database
GPG Key ID: 7E086DD661263264

View File

@ -35,7 +35,7 @@ ToxCall::ToxCall(uint32_t CallId)
#endif #endif
} }
ToxCall::ToxCall(ToxCall&& other) ToxCall::ToxCall(ToxCall&& other) noexcept
: sendAudioTimer{other.sendAudioTimer}, callId{other.callId}, : sendAudioTimer{other.sendAudioTimer}, callId{other.callId},
inactive{other.inactive}, muteMic{other.muteMic}, muteVol{other.muteVol}, inactive{other.inactive}, muteMic{other.muteMic}, muteVol{other.muteVol},
alSource{other.alSource} alSource{other.alSource}
@ -68,7 +68,7 @@ ToxCall::~ToxCall()
#endif #endif
} }
const ToxCall& ToxCall::operator=(ToxCall&& other) const ToxCall& ToxCall::operator=(ToxCall&& other) noexcept
{ {
sendAudioTimer = other.sendAudioTimer; sendAudioTimer = other.sendAudioTimer;
other.sendAudioTimer = nullptr; other.sendAudioTimer = nullptr;
@ -142,7 +142,7 @@ ToxFriendCall::ToxFriendCall(uint32_t FriendNum, bool VideoEnabled, CoreAV& av)
} }
} }
ToxFriendCall::ToxFriendCall(ToxFriendCall&& other) ToxFriendCall::ToxFriendCall(ToxFriendCall&& other) noexcept
: ToxCall(move(other)), : ToxCall(move(other)),
videoEnabled{other.videoEnabled}, nullVideoBitrate{other.nullVideoBitrate}, videoEnabled{other.videoEnabled}, nullVideoBitrate{other.nullVideoBitrate},
videoSource{other.videoSource}, state{other.state}, videoSource{other.videoSource}, state{other.state},
@ -172,7 +172,7 @@ ToxFriendCall::~ToxFriendCall()
} }
} }
const ToxFriendCall& ToxFriendCall::operator=(ToxFriendCall&& other) const ToxFriendCall& ToxFriendCall::operator=(ToxFriendCall&& other) noexcept
{ {
ToxCall::operator =(move(other)); ToxCall::operator =(move(other));
videoEnabled = other.videoEnabled; videoEnabled = other.videoEnabled;
@ -204,12 +204,12 @@ ToxGroupCall::ToxGroupCall(int GroupNum, CoreAV &av)
sendAudioTimer->start(); sendAudioTimer->start();
} }
ToxGroupCall::ToxGroupCall(ToxGroupCall&& other) ToxGroupCall::ToxGroupCall(ToxGroupCall&& other) noexcept
: ToxCall(move(other)) : ToxCall(move(other))
{ {
} }
const ToxGroupCall &ToxGroupCall::operator=(ToxGroupCall &&other) const ToxGroupCall &ToxGroupCall::operator=(ToxGroupCall &&other) noexcept
{ {
ToxCall::operator =(move(other)); ToxCall::operator =(move(other));