Remove unused compat code for Qt < 5.14

master
Linus Jahn 2021-04-21 17:32:17 +02:00
parent 4ab3e07cd7
commit fe2f979bb3
5 changed files with 0 additions and 31 deletions

View File

@ -63,11 +63,7 @@ AvatarFileStorage::AvatarFileStorage(QObject *parent) : QObject(parent)
QString line = stream.readLine();
while (!line.isNull()) {
// get hash and jid from line (seperated by a blank)
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
QStringList list = line.split(' ', Qt::SkipEmptyParts);
#else
QStringList list = line.split(' ', QString::SkipEmptyParts);
#endif
// set the hash for the jid
m_jidAvatarMap[list.at(1)] = list.at(0);

View File

@ -1502,12 +1502,8 @@ EmojiProxyModel::EmojiProxyModel(QObject *parent)
: QSortFilterProxyModel(parent)
{
QSettings *settings = Kaidan::instance()->settings();
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
QStringList list = settings->value(QLatin1String(KAIDAN_SETTINGS_FAVORITE_EMOJIS)).toStringList();
m_favoriteEmojis = QSet<QString>(list.begin(), list.end());
#else
m_favoriteEmojis = settings->value(QLatin1String(FAVORITES_EMOJIS_SETTINGS_PATH)).toStringList().toSet();
#endif
}
EmojiProxyModel::~EmojiProxyModel()

View File

@ -78,7 +78,6 @@ QString Presence::availabilityToText(Availability type)
QColor Presence::availabilityToColor(Availability type)
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
switch (type) {
case Online:
return QColorConstants::Svg::green;
@ -93,22 +92,6 @@ QColor Presence::availabilityToColor(Availability type)
case Offline:
return QColorConstants::Svg::silver;
}
#else
switch (type) {
case Online:
return "green";
case Chat:
return "darkgreen";
case Away:
return "orange";
case DND:
return QColor::fromRgb(218, 68, 83);
case XA:
return "orange";
case Offline:
return "silver";
}
#endif
Q_UNREACHABLE();
return {};
}

View File

@ -207,11 +207,9 @@ QImage *QrCodeVideoFrame::toGrayscaleImage()
case QVideoFrame::Format_BGRA32_Premultiplied:
image = rgbDataToGrayscale(data, captureRect, 3, 2, 1, 0, true);
break;
#if QT_VERSION >= QT_VERSION_CHECK(5, 13, 0)
case QVideoFrame::Format_ABGR32:
image = rgbDataToGrayscale(data, captureRect, 0, 3, 2, 1);
break;
#endif
case QVideoFrame::Format_BGR32:
image = rgbDataToGrayscale(data, captureRect, 3, 2, 1, 0);
break;

View File

@ -177,12 +177,8 @@ void RosterDb::replaceItems(const QHash<QString, RosterItem> &items)
m_db->transaction();
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
QList<QString> keys = items.keys();
QSet<QString> newJids = QSet<QString>(keys.begin(), keys.end());
#else
QSet<QString> newJids = items.keys().toSet();
#endif
for (const auto &oldItem : qAsConst(currentItems)) {
// We will remove the already existing JIDs, so we get a set of JIDs that