thek0tyara/nheko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make Nheko compile on Qt6

Browse source
This commit is contained in:
Nicolas Werner 2023-06-02 00:24:26 +02:00
parent 0ac46ea209
commit b518f6902e
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
39 changed files with 108 additions and 361 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/UserSettingsPage.cpp
View file

@ -1585,8 +1585,6 @@ UserSettingsModel::data(const QModelIndex &index, int role) const
l.push_back(QString::fromStdString(d));
return l;
};
static QFontDatabase fontDb;
switch (index.row()) {
case Theme:
return QStringList{
@ -1605,9 +1603,9 @@ UserSettingsModel::data(const QModelIndex &index, int role) const
i->camera().toStdString(), i->cameraResolution().toStdString()));
case Font:
return fontDb.families();
return QFontDatabase::families();
case EmojiFont:
return fontDb.families(QFontDatabase::WritingSystem::Symbol);
return QFontDatabase::families(QFontDatabase::WritingSystem::Symbol);
case Ringtone: {
QStringList l{
QStringLiteral("Mute"),
@ -1651,8 +1649,6 @@ UserSettingsModel::data(const QModelIndex &index, int role) const
bool
UserSettingsModel::setData(const QModelIndex &index, const QVariant &value, int role)
{
static QFontDatabase fontDb;
auto i = UserSettings::instance();
if (role == Value) {
switch (index.row()) {
@ -1677,7 +1673,7 @@ UserSettingsModel::setData(const QModelIndex &index, const QVariant &value, int
return false;
}
case ScaleFactor: {
if (value.canConvert(QMetaType::Double)) {
if (value.canConvert(QMetaType::fromType<double>())) {
utils::setScaleFactor(static_cast<float>(value.toDouble()));
return true;
} else
@ -1782,7 +1778,7 @@ UserSettingsModel::setData(const QModelIndex &index, const QVariant &value, int
return false;
}
case TimelineMaxWidth: {
if (value.canConvert(QMetaType::Int)) {
if (value.canConvert(QMetaType::fromType<int>())) {
i->setTimelineMaxWidth(value.toInt());
return true;
} else
@ -1880,7 +1876,7 @@ UserSettingsModel::setData(const QModelIndex &index, const QVariant &value, int
return false;
}
case PrivacyScreenTimeout: {
if (value.canConvert(QMetaType::Int)) {
if (value.canConvert(QMetaType::fromType<int>())) {
i->setPrivacyScreenTimeout(value.toInt());
return true;
} else
@ -1894,7 +1890,7 @@ UserSettingsModel::setData(const QModelIndex &index, const QVariant &value, int
return false;
}
case FontSize: {
if (value.canConvert(QMetaType::Double)) {
if (value.canConvert(QMetaType::fromType<double>())) {
i->setFontSize(value.toDouble());
return true;
} else
@ -1902,7 +1898,7 @@ UserSettingsModel::setData(const QModelIndex &index, const QVariant &value, int
}
case Font: {
if (value.userType() == QMetaType::Int) {
i->setFontFamily(fontDb.families().at(value.toInt()));
i->setFontFamily(QFontDatabase::families().at(value.toInt()));
return true;
} else
return false;
@ -1910,7 +1906,7 @@ UserSettingsModel::setData(const QModelIndex &index, const QVariant &value, int
case EmojiFont: {
if (value.userType() == QMetaType::Int) {
i->setEmojiFontFamily(
fontDb.families(QFontDatabase::WritingSystem::Symbol).at(value.toInt()));
QFontDatabase::families(QFontDatabase::WritingSystem::Symbol).at(value.toInt()));
return true;
} else
return false;