Remove no longer needed ifdefs
This commit is contained in:
@@ -324,19 +324,11 @@ void RoomManager::visitRoom(Room *r, const QString &eventId)
|
||||
void RoomManager::joinRoom(Quotient::Connection *account, const QString &roomAliasOrId, const QStringList &viaServers)
|
||||
{
|
||||
auto job = account->joinRoom(roomAliasOrId, viaServers);
|
||||
#if Quotient_VERSION_MINOR > 8
|
||||
connect(
|
||||
job.get(),
|
||||
&Quotient::BaseJob::finished,
|
||||
this,
|
||||
[this, account](Quotient::BaseJob *finish) {
|
||||
#else
|
||||
connect(
|
||||
job,
|
||||
&Quotient::BaseJob::finished,
|
||||
this,
|
||||
[this, account](Quotient::BaseJob *finish) {
|
||||
#endif
|
||||
if (finish->status() == Quotient::BaseJob::Success) {
|
||||
connect(
|
||||
account,
|
||||
@@ -355,28 +347,16 @@ void RoomManager::joinRoom(Quotient::Connection *account, const QString &roomAli
|
||||
|
||||
void RoomManager::knockRoom(NeoChatConnection *account, const QString &roomAliasOrId, const QString &reason, const QStringList &viaServers)
|
||||
{
|
||||
#if Quotient_VERSION_MINOR > 8
|
||||
auto job = account->callApi<KnockRoomJob>(roomAliasOrId, viaServers, viaServers, reason);
|
||||
#else
|
||||
auto job = account->callApi<KnockRoomJob>(roomAliasOrId, viaServers, reason);
|
||||
#endif
|
||||
// Upon completion, ensure a room object is created in case it hasn't come
|
||||
// with a sync yet. If the room object is not there, provideRoom() will
|
||||
// create it in Join state. finished() is used here instead of success()
|
||||
// to overtake clients that may add their own slots to finished().
|
||||
#if Quotient_VERSION_MINOR > 8
|
||||
connect(
|
||||
job.get(),
|
||||
&BaseJob::finished,
|
||||
this,
|
||||
[this, job, account] {
|
||||
#else
|
||||
connect(
|
||||
job,
|
||||
&BaseJob::finished,
|
||||
this,
|
||||
[this, job, account] {
|
||||
#endif
|
||||
if (job->status() == Quotient::BaseJob::Success) {
|
||||
connect(
|
||||
account,
|
||||
|
||||
Reference in New Issue
Block a user