daniel/QTeletextMaker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix clang compile warnings

Browse Source
This commit is contained in:
Gavin MacGregor
2025-01-19 19:22:09 +00:00
parent 6e4f1df285
commit df1122f621
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/qteletextdecoder/levelonepage.h
View File

@@ -52,7 +52,7 @@ public:
void clearPage(); void clearPage();
int maxEnhancements() const { return 208; }; int maxEnhancements() const override { return 208; };
/* void setSubPageNumber(int); */ /* void setSubPageNumber(int); */
int cycleValue() const { return m_cycleValue; }; int cycleValue() const { return m_cycleValue; };

2
src/qteletextmaker/mainwidget.h
View File

@@ -52,7 +52,7 @@ public:
QSize sizeHint() { return QSize(480+(pageDecode()->leftSidePanelColumns()+pageDecode()->rightSidePanelColumns())*12, 250); } 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; } TeletextDocument* document() const { return m_teletextDocument; }
TeletextPageDecode *pageDecode() { return &m_pageDecode; } TeletextPageDecode *pageDecode() { return &m_pageDecode; }

3
src/qteletextmaker/mainwindow.cpp
View File

@@ -264,7 +264,7 @@ void MainWindow::exportImage()
QImage scaledImage[6]; QImage scaledImage[6];
for (int p=0; p<6; p++) for (int p=0; p<6; p++)
if (!interImage[p].isNull()) if (!interImage[p].isNull()) {
if (m_viewAspectRatio == 3) if (m_viewAspectRatio == 3)
// Aspect ratio is Pixel 1:2 so we only need to double the vertical height // 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); 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 // 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); 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 (suffix == "png") {
if (scaledImage[0].save(exportFileName, "PNG")) if (scaledImage[0].save(exportFileName, "PNG"))

8
src/qteletextmaker/x26model.h
View File

@@ -35,11 +35,11 @@ public:
int rowCount(const QModelIndex &parent = QModelIndex()) const override ; int rowCount(const QModelIndex &parent = QModelIndex()) const override ;
int columnCount(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; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
bool setData(const QModelIndex &index, const QVariant &value, int role); bool setData(const QModelIndex &index, const QVariant &value, int role) override;
QVariant headerData(int section, Qt::Orientation orientation, int role) const; QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
bool insertRows(int position, int rows, const QModelIndex &parent); bool insertRows(int position, int rows, const QModelIndex &parent) override;
bool insertRows(int position, int rows, const QModelIndex &parent, X26Triplet triplet); 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; // Qt::ItemFlags flags(const QModelIndex &index) const;
// The x26commands classes manipulate the model but beginInsertRows and endInsertRows // The x26commands classes manipulate the model but beginInsertRows and endInsertRows