Commit 1cf93d78 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Fix more qt6 compile error

parent f1e4ee9b
Pipeline #183665 passed with stage
in 6 minutes and 53 seconds
......@@ -1673,10 +1673,10 @@ void MainWindow::setupActions()
act->setData('C');
addAction(QStringLiteral("cut_timeline_clip"), i18n("Cut Clip"), this, SLOT(slotCutTimelineClip()), QIcon::fromTheme(QStringLiteral("edit-cut")),
Qt::SHIFT + Qt::Key_R);
Qt::SHIFT | Qt::Key_R);
addAction(QStringLiteral("cut_timeline_all_clips"), i18n("Cut All Clips"), this, SLOT(slotCutTimelineAllClips()),
QIcon::fromTheme(QStringLiteral("edit-cut")), Qt::CTRL + Qt::SHIFT + Qt::Key_R);
QIcon::fromTheme(QStringLiteral("edit-cut")), Qt::CTRL | Qt::SHIFT | Qt::Key_R);
addAction(QStringLiteral("delete_timeline_clip"), i18n("Delete Selected Item"), this, SLOT(slotDeleteItem()),
QIcon::fromTheme(QStringLiteral("edit-delete")), Qt::Key_Delete);
......@@ -1808,7 +1808,7 @@ void MainWindow::setupActions()
addAction(QStringLiteral("delete_all_guides"), i18n("Delete All Guides"), this, SLOT(slotDeleteAllGuides()),
QIcon::fromTheme(QStringLiteral("edit-delete")));
addAction(QStringLiteral("add_subtitle"), i18n("Add Subtitle"), this, SLOT(slotAddSubtitle()), QIcon::fromTheme(QStringLiteral("list-add")),
Qt::SHIFT + Qt::Key_S);
Qt::SHIFT | Qt::Key_S);
addAction(QStringLiteral("disable_subtitle"), i18n("Disable Subtitle"), this, SLOT(slotDisableSubtitle()), QIcon::fromTheme(QStringLiteral("view-hidden")));
addAction(QStringLiteral("lock_subtitle"), i18n("Lock Subtitle"), this, SLOT(slotLockSubtitle()), QIcon::fromTheme(QStringLiteral("kdenlive-lock")));
......
......@@ -171,19 +171,20 @@ public:
if (decode) {
KFileMetaData::PropertyInfo info(property);
if (info.valueType() == QVariant::DateTime) {
new QTreeWidgetItem(m_tree, {info.displayName(), value.toDateTime().toString(Qt::DefaultLocaleShortDate)});
new QTreeWidgetItem(m_tree, QStringList{info.displayName(), value.toDateTime().toString(Qt::DefaultLocaleShortDate)});
} else if (info.valueType() == QVariant::Int) {
int val = value.toInt();
if (property == KFileMetaData::Property::BitRate) {
// Adjust unit for bitrate
new QTreeWidgetItem(m_tree, {info.displayName(), QString::number(val / 1000) + QLatin1Char(' ') + i18nc("Kilobytes per seconds", "kb/s")});
new QTreeWidgetItem(
m_tree, QStringList{info.displayName(), QString::number(val / 1000) + QLatin1Char(' ') + i18nc("Kilobytes per seconds", "kb/s")});
} else {
new QTreeWidgetItem(m_tree, {info.displayName(), QString::number(val)});
new QTreeWidgetItem(m_tree, QStringList{info.displayName(), QString::number(val)});
}
} else if (info.valueType() == QVariant::Double) {
new QTreeWidgetItem(m_tree, {info.displayName(), QString::number(value.toDouble())});
new QTreeWidgetItem(m_tree, QStringList{info.displayName(), QString::number(value.toDouble())});
} else {
new QTreeWidgetItem(m_tree, {info.displayName(), value.toString()});
new QTreeWidgetItem(m_tree, QStringList{info.displayName(), value.toString()});
}
}
}
......
......@@ -373,7 +373,7 @@ TitleWidget::TitleWidget(const QUrl &url, QString projectTitlePath, Monitor *mon
m_buttonCursor = m_toolbar->addAction(QIcon::fromTheme(QStringLiteral("transform-move")), i18n("Selection Tool"));
m_buttonCursor->setCheckable(true);
m_buttonCursor->setShortcut(Qt::ALT + Qt::Key_S);
m_buttonCursor->setShortcut(Qt::ALT | Qt::Key_S);
m_buttonCursor->setToolTip(i18n("Selection Tool") + QLatin1Char(' ') + m_buttonCursor->shortcut().toString());
connect(m_buttonCursor, &QAction::triggered, this, &TitleWidget::slotSelectTool);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment