Skip to content

Commit f898d57

Browse files
committed
FIX(client,images): Cast the last index of custom objects correctly and use overload of clear correctly
1 parent e11d491 commit f898d57

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/mumble/CustomElements.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ void LogTextBrowser::keyPressEvent(QKeyEvent *keyEvt) {
421421
int docHeight = verticalScrollBar()->maximum();
422422
auto customObjects = qvariant_cast< QList< QObject * > >(doc.property("customObjects"));
423423

424-
int lastIndex = customObjects.size() - 1;
424+
int lastIndex = static_cast< int >(customObjects.size() - 1);
425425
int focusIndex = doc.property("customObjectFocusIndex").toInt();
426426
int scrollStep = 15;
427427
if (modifiers.testFlag(Qt::ControlModifier)) {
@@ -504,7 +504,7 @@ void LogTextBrowser::keyReleaseEvent(QKeyEvent *keyEvt) {
504504

505505
QTextDocument *doc = document();
506506
auto customObjects = qvariant_cast< QList< QObject * > >(doc->property("customObjects"));
507-
int lastIndex = customObjects.size() - 1;
507+
int lastIndex = static_cast< int >(customObjects.size() - 1);
508508
bool isFocusIndex;
509509
int inputFocusIndex = queuedNumericInput.toInt(&isFocusIndex);
510510
bool isFocusIndexTooHigh = !isFocusIndex || inputFocusIndex > lastIndex;
@@ -1953,7 +1953,7 @@ void ImageAnimationTextObject::toggleVideoControls() {
19531953

19541954
void ImageAnimationTextObject::addVideoControlsSwitch(QMenu &menu) {
19551955
QString firstWord = areVideoControlsShown ? tr("Hide") : tr("Show");
1956-
menu.addAction(tr("%1 Video Controls").arg(firstWord), this, [this]() { toggleVideoControls(); });
1956+
menu.addAction(tr("%1 Video Controls").arg(firstWord), this, &ImageAnimationTextObject::toggleVideoControls);
19571957
}
19581958

19591959
bool ImageAnimationTextObject::mousePress(const QPoint &mouseDocPos, const Qt::MouseButton &button, QMovie &animation) {

src/mumble/MainWindow.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1039,7 +1039,7 @@ void MainWindow::on_qteLog_customContextMenuRequested(const QPoint &mpos) {
10391039
}
10401040

10411041
menu->addSeparator();
1042-
menu->addAction(tr("Clear"), qteLog, qOverload< void >(&LogTextBrowser::clear));
1042+
menu->addAction(tr("Clear"), qteLog, static_cast< void (LogTextBrowser::*)(void) >(&LogTextBrowser::clear));
10431043
menu->exec(qteLog->mapToGlobal(mpos));
10441044
delete menu;
10451045
}

0 commit comments

Comments
 (0)