From df1122f62142f31eb6b62051fad272c03f93eebc Mon Sep 17 00:00:00 2001 From: Gavin MacGregor Date: Sun, 19 Jan 2025 19:22:09 +0000 Subject: [PATCH] Fix clang compile warnings --- src/qteletextdecoder/levelonepage.h | 2 +- src/qteletextmaker/mainwidget.h | 2 +- src/qteletextmaker/mainwindow.cpp | 3 ++- src/qteletextmaker/x26model.h | 8 ++++---- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/qteletextdecoder/levelonepage.h b/src/qteletextdecoder/levelonepage.h index fd3269a..9a9d6b8 100644 --- a/src/qteletextdecoder/levelonepage.h +++ b/src/qteletextdecoder/levelonepage.h @@ -52,7 +52,7 @@ public: void clearPage(); - int maxEnhancements() const { return 208; }; + int maxEnhancements() const override { return 208; }; /* void setSubPageNumber(int); */ int cycleValue() const { return m_cycleValue; }; diff --git a/src/qteletextmaker/mainwidget.h b/src/qteletextmaker/mainwidget.h index 1990384..71866a9 100644 --- a/src/qteletextmaker/mainwidget.h +++ b/src/qteletextmaker/mainwidget.h @@ -52,7 +52,7 @@ public: QSize sizeHint() { return QSize(480+(pageDecode()->leftSidePanelColumns()+pageDecode()->rightSidePanelColumns())*12, 250); } - void inputMethodEvent(QInputMethodEvent *event); + void inputMethodEvent(QInputMethodEvent *event) override; TeletextDocument* document() const { return m_teletextDocument; } TeletextPageDecode *pageDecode() { return &m_pageDecode; } diff --git a/src/qteletextmaker/mainwindow.cpp b/src/qteletextmaker/mainwindow.cpp index d29bcbc..ea131b0 100644 --- a/src/qteletextmaker/mainwindow.cpp +++ b/src/qteletextmaker/mainwindow.cpp @@ -264,7 +264,7 @@ void MainWindow::exportImage() QImage scaledImage[6]; for (int p=0; p<6; p++) - if (!interImage[p].isNull()) + if (!interImage[p].isNull()) { if (m_viewAspectRatio == 3) // Aspect ratio is Pixel 1:2 so we only need to double the vertical height scaledImage[p] = interImage[p].scaled(interImage[p].width(), interImage[p].height()*2, Qt::IgnoreAspectRatio, Qt::FastTransformation); @@ -276,6 +276,7 @@ void MainWindow::exportImage() // Don't smooth GIF as it's bound to break the 256 colour limit scaledImage[p] = doubleHeightImage.scaled((int)((float)doubleHeightImage.width() * aspectRatioHorizontalScaling[m_viewAspectRatio] * 2), doubleHeightImage.height(), Qt::IgnoreAspectRatio, (suffix == "gif") ? Qt::FastTransformation : Qt::SmoothTransformation); } + } if (suffix == "png") { if (scaledImage[0].save(exportFileName, "PNG")) diff --git a/src/qteletextmaker/x26model.h b/src/qteletextmaker/x26model.h index 51ad67f..8eb87fe 100644 --- a/src/qteletextmaker/x26model.h +++ b/src/qteletextmaker/x26model.h @@ -35,11 +35,11 @@ public: int rowCount(const QModelIndex &parent = QModelIndex()) const override ; int columnCount(const QModelIndex &parent = QModelIndex()) const override; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; - bool setData(const QModelIndex &index, const QVariant &value, int role); - QVariant headerData(int section, Qt::Orientation orientation, int role) const; - bool insertRows(int position, int rows, const QModelIndex &parent); + bool setData(const QModelIndex &index, const QVariant &value, int role) override; + QVariant headerData(int section, Qt::Orientation orientation, int role) const override; + bool insertRows(int position, int rows, const QModelIndex &parent) override; bool insertRows(int position, int rows, const QModelIndex &parent, X26Triplet triplet); - bool removeRows(int position, int rows, const QModelIndex &index); + bool removeRows(int position, int rows, const QModelIndex &index) override; // Qt::ItemFlags flags(const QModelIndex &index) const; // The x26commands classes manipulate the model but beginInsertRows and endInsertRows