From 6b355d1aa87072143e09ea5269e8cf465318a64f Mon Sep 17 00:00:00 2001
From: Alexey Rusakov <Kitsune-Ral@users.sf.net>
Date: Sat, 18 Jun 2022 21:26:43 +0200
Subject: Drop pre-Qt 5.15 code

---
 lib/connection.cpp | 16 ----------------
 1 file changed, 16 deletions(-)

(limited to 'lib/connection.cpp')

diff --git a/lib/connection.cpp b/lib/connection.cpp
index c390cc05..2319a38a 100644
--- a/lib/connection.cpp
+++ b/lib/connection.cpp
@@ -49,10 +49,6 @@
 #    include <qt5keychain/keychain.h>
 #endif
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
-#    include <QtCore/QCborValue>
-#endif
-
 #include <QtCore/QCoreApplication>
 #include <QtCore/QDir>
 #include <QtCore/QElapsedTimer>
@@ -1826,16 +1822,10 @@ void Connection::saveRoomState(Room* r) const
     QFile outRoomFile { stateCacheDir().filePath(
         SyncData::fileNameForRoom(r->id())) };
     if (outRoomFile.open(QFile::WriteOnly)) {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
         const auto data =
             d->cacheToBinary
                 ? QCborValue::fromJsonValue(r->toJson()).toCbor()
                 : QJsonDocument(r->toJson()).toJson(QJsonDocument::Compact);
-#else
-        QJsonDocument json { r->toJson() };
-        const auto data = d->cacheToBinary ? json.toBinaryData()
-                                           : json.toJson(QJsonDocument::Compact);
-#endif
         outRoomFile.write(data.data(), data.size());
         qCDebug(MAIN) << "Room state cache saved to" << outRoomFile.fileName();
     } else {
@@ -1905,15 +1895,9 @@ void Connection::saveState() const
     }
 #endif
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
     const auto data =
         d->cacheToBinary ? QCborValue::fromJsonValue(rootObj).toCbor()
                          : QJsonDocument(rootObj).toJson(QJsonDocument::Compact);
-#else
-    QJsonDocument json { rootObj };
-    const auto data = d->cacheToBinary ? json.toBinaryData()
-                                       : json.toJson(QJsonDocument::Compact);
-#endif
     qCDebug(PROFILER) << "Cache for" << userId() << "generated in" << et;
 
     outFile.write(data.data(), data.size());
-- 
cgit v1.2.3