From d70cd0fa94b0f015d25bb915425ec1fb21dd2e2b Mon Sep 17 00:00:00 2001 From: Leonardo Zide Date: Sun, 23 Nov 2025 22:52:28 -0800 Subject: [PATCH] Fixed warnings. --- common/group.cpp | 2 +- common/lc_aboutdialog.cpp | 13 ++++++++++--- common/lc_blenderpreferences.cpp | 10 +++++----- common/lc_category.cpp | 2 +- common/lc_file.h | 2 +- common/lc_minifigdialog.cpp | 10 +++++++--- common/lc_model.cpp | 2 +- common/lc_objectproperty.cpp | 2 +- common/lc_shortcuts.cpp | 4 ++-- common/lc_stringcache.cpp | 2 +- qt/lc_qpreferencesdialog.cpp | 5 +++-- qt/lc_qutils.cpp | 2 +- 12 files changed, 34 insertions(+), 22 deletions(-) diff --git a/common/group.cpp b/common/group.cpp index 336d9582..d0ad896c 100644 --- a/common/group.cpp +++ b/common/group.cpp @@ -41,7 +41,7 @@ void lcGroup::CreateName(const std::vector>& Groups) int Max = 0; QString Prefix = QApplication::tr("Group #"); - const int Length = Prefix.length(); + const qsizetype Length = Prefix.length(); for (const std::unique_ptr& Group : Groups) { diff --git a/common/lc_aboutdialog.cpp b/common/lc_aboutdialog.cpp index 950e5385..bce828a2 100644 --- a/common/lc_aboutdialog.cpp +++ b/common/lc_aboutdialog.cpp @@ -18,14 +18,21 @@ lcAboutDialog::lcAboutDialog(QWidget* Parent) #endif lcViewWidget* Widget = gMainWindow->GetActiveView()->GetWidget(); - QSurfaceFormat Format = Widget->context()->format(); - + QOpenGLContext* Context = Widget->context(); + QOpenGLFunctions* Functions = Context->functions(); + QSurfaceFormat Format = Context->format(); + qDebug() << Format; int ColorDepth = Format.redBufferSize() + Format.greenBufferSize() + Format.blueBufferSize() + Format.alphaBufferSize(); const QString QtVersionFormat = tr("Qt Version %1 (compiled with %2)\n\n"); const QString QtVersion = QtVersionFormat.arg(qVersion(), QT_VERSION_STR); + const QString VersionFormat = tr("OpenGL Version %1 (GLSL %2)\n%3 - %4\n\n"); - const QString Version = VersionFormat.arg(QString((const char*)glGetString(GL_VERSION)), QString((const char*)glGetString(GL_SHADING_LANGUAGE_VERSION)), QString((const char*)glGetString(GL_RENDERER)), QString((const char*)glGetString(GL_VENDOR))); + const QString GLVersion(reinterpret_cast(Functions->glGetString(GL_VERSION))); + const QString ShaderVersion(reinterpret_cast(Functions->glGetString(GL_SHADING_LANGUAGE_VERSION))); + const QString Renderer(reinterpret_cast(Functions->glGetString(GL_RENDERER))); + const QString Vendor(reinterpret_cast(Functions->glGetString(GL_VENDOR))); + const QString Version = VersionFormat.arg(GLVersion, ShaderVersion, Renderer, Vendor); const QString BuffersFormat = tr("Color Buffer: %1 bits\nDepth Buffer: %2 bits\nStencil Buffer: %3 bits\n\n"); const QString Buffers = BuffersFormat.arg(QString::number(ColorDepth), QString::number(Format.depthBufferSize()), QString::number(Format.stencilBufferSize())); diff --git a/common/lc_blenderpreferences.cpp b/common/lc_blenderpreferences.cpp index d72310b4..380d0dfa 100644 --- a/common/lc_blenderpreferences.cpp +++ b/common/lc_blenderpreferences.cpp @@ -1578,8 +1578,8 @@ int lcBlenderPreferences::GetBlenderAddon(const QString& BlenderDir) qint64 DataSize = File.size(); const qint64 BufferSize = Q_INT64_C(1000); char Buf[BufferSize]; - int BytesRead; - int ReadSize = qMin(DataSize, BufferSize); + qint64 BytesRead; + qint64 ReadSize = qMin(DataSize, BufferSize); while (ReadSize > 0 && (BytesRead = File.read(Buf, ReadSize)) > 0) { DataSize -= BytesRead; @@ -1883,7 +1883,7 @@ void lcBlenderPreferences::ReadStdOut(const QString& StdOutput, QString& Errors) const QString SaveAddonVersion = mAddonVersion; const QString SaveVersion = mBlenderVersion; - int EditListItems = mPathLineEditList.size(); + qsizetype EditListItems = mPathLineEditList.size(); for (const QString& StdOutLine : StdOutLines) { if (StdOutLine.isEmpty()) @@ -3625,7 +3625,7 @@ int lcBlenderPreferences::ShowMessage(QWidget* Parent, const QString& Header, c QWidget* TextWidget = BoxLayoutItem->widget(); if (TextWidget) { - int FixedWidth = Body.length() * FontWidth; + qsizetype FixedWidth = Body.length() * FontWidth; if (FixedWidth == MinimumWidth) { int Index = (MinimumWidth / FontWidth) - 1; @@ -3634,7 +3634,7 @@ int lcBlenderPreferences::ShowMessage(QWidget* Parent, const QString& Header, c } else if (FixedWidth < MinimumWidth) FixedWidth = MinimumWidth; - TextWidget->setFixedWidth(FixedWidth); + TextWidget->setFixedWidth(static_cast(FixedWidth)); } } diff --git a/common/lc_category.cpp b/common/lc_category.cpp index 3899f423..d862c68a 100644 --- a/common/lc_category.cpp +++ b/common/lc_category.cpp @@ -106,7 +106,7 @@ bool lcLoadCategories(const QByteArray& Buffer, std::vector& for (QString Line = Stream.readLine(); !Line.isNull(); Line = Stream.readLine()) { - int Equals = Line.indexOf('='); + qsizetype Equals = Line.indexOf('='); if (Equals == -1) continue; diff --git a/common/lc_file.h b/common/lc_file.h index adbf97e1..7d33a54a 100644 --- a/common/lc_file.h +++ b/common/lc_file.h @@ -283,7 +283,7 @@ public: void WriteQString(const QString& String) { QByteArray Data = String.toUtf8(); - WriteU32(Data.size()); + WriteU32(static_cast(Data.size())); WriteBuffer(Data, Data.size()); } diff --git a/common/lc_minifigdialog.cpp b/common/lc_minifigdialog.cpp index d7b04d6f..ac672477 100644 --- a/common/lc_minifigdialog.cpp +++ b/common/lc_minifigdialog.cpp @@ -359,7 +359,7 @@ void lcMinifigDialog::PieceButtonClicked() if (Search == mPieceButtons.end()) return; - int ItemIndex = std::distance(mPieceButtons.begin(), Search); + int ItemIndex = static_cast(std::distance(mPieceButtons.begin(), Search)); PieceInfo* CurrentInfo = mMinifigWizard->mMinifig.Parts[ItemIndex]; QPoint Position = PieceButton->mapToGlobal(PieceButton->rect().bottomLeft()); @@ -411,7 +411,9 @@ void lcMinifigDialog::ColorChanged(int Index) SetCurrentTemplateModified(); UpdateTemplateCombo(); - mMinifigWizard->SetColorIndex(std::distance(mColorPickers.begin(), Search), Index); + int ItemIndex = static_cast(std::distance(mColorPickers.begin(), Search)); + + mMinifigWizard->SetColorIndex(ItemIndex, Index); mView->Redraw(); } @@ -425,6 +427,8 @@ void lcMinifigDialog::AngleChanged(double Value) SetCurrentTemplateModified(); UpdateTemplateCombo(); - mMinifigWizard->SetAngle(std::distance(mSpinBoxes.begin(), Search), Value); + int ItemIndex = static_cast(std::distance(mSpinBoxes.begin(), Search)); + + mMinifigWizard->SetAngle(ItemIndex, Value); mView->Redraw(); } diff --git a/common/lc_model.cpp b/common/lc_model.cpp index f8985962..9a1392bb 100644 --- a/common/lc_model.cpp +++ b/common/lc_model.cpp @@ -2769,7 +2769,7 @@ void lcModel::ShowEditGroupsDialog() QString lcModel::GetGroupName(const QString& Prefix) { - const int Length = Prefix.length(); + const qsizetype Length = Prefix.length(); int Max = 0; for (const std::unique_ptr& Group : mGroups) diff --git a/common/lc_objectproperty.cpp b/common/lc_objectproperty.cpp index def6ac03..6648507a 100644 --- a/common/lc_objectproperty.cpp +++ b/common/lc_objectproperty.cpp @@ -339,7 +339,7 @@ bool lcObjectProperty::LoadFromDataStream(QDataStream& Stream) mKeys.resize(KeyCount); - size_t DataSize = KeyCount * sizeof(lcObjectPropertyKey); + qsizetype DataSize = KeyCount * sizeof(lcObjectPropertyKey); if (Stream.readRawData(reinterpret_cast(mKeys.data()), DataSize) != DataSize) return false; diff --git a/common/lc_shortcuts.cpp b/common/lc_shortcuts.cpp index f04bdd42..1e035b1a 100644 --- a/common/lc_shortcuts.cpp +++ b/common/lc_shortcuts.cpp @@ -107,7 +107,7 @@ bool lcKeyboardShortcuts::Load(QTextStream& Stream) for (QString Line = Stream.readLine(); !Line.isNull(); Line = Stream.readLine()) { - int Equals = Line.indexOf('='); + qsizetype Equals = Line.indexOf('='); if (Equals == -1) continue; @@ -231,7 +231,7 @@ bool lcMouseShortcuts::Load(const QStringList& FullShortcuts) for (const QString& FullShortcut : FullShortcuts) { - int Equals = FullShortcut.indexOf('='); + qsizetype Equals = FullShortcut.indexOf('='); if (Equals == -1) continue; diff --git a/common/lc_stringcache.cpp b/common/lc_stringcache.cpp index 618e1561..e05c1a70 100644 --- a/common/lc_stringcache.cpp +++ b/common/lc_stringcache.cpp @@ -195,6 +195,6 @@ void lcStringCache::DrawStrings(lcContext* Context, const lcMatrix44* Transforms Context->BindTexture2D(mTexture); Context->SetColor(0.0f, 0.0f, 0.0f, 1.0f); - Context->DrawPrimitives(GL_TRIANGLES, 0, Strings.size() * 6); + Context->DrawPrimitives(GL_TRIANGLES, 0, static_cast(Strings.size()) * 6); } diff --git a/qt/lc_qpreferencesdialog.cpp b/qt/lc_qpreferencesdialog.cpp index 212f21b7..bc8e3eac 100644 --- a/qt/lc_qpreferencesdialog.cpp +++ b/qt/lc_qpreferencesdialog.cpp @@ -903,8 +903,9 @@ void lcQPreferencesDialog::updateCommandList() const QString identifier = tr(gCommands[actionIdx].ID); - int pos = identifier.indexOf(QLatin1Char('.')); - int subPos = identifier.indexOf(QLatin1Char('.'), pos + 1); + qsizetype pos = identifier.indexOf(QLatin1Char('.')); + qsizetype subPos = identifier.indexOf(QLatin1Char('.'), pos + 1); + if (subPos == -1) subPos = pos; diff --git a/qt/lc_qutils.cpp b/qt/lc_qutils.cpp index 3c7a6fbc..4130876b 100644 --- a/qt/lc_qutils.cpp +++ b/qt/lc_qutils.cpp @@ -15,7 +15,7 @@ QString lcFormatValue(float Value, int Precision) { QString String = QString::number(Value, 'f', Precision); - const int Dot = String.indexOf('.'); + const qsizetype Dot = String.indexOf('.'); if (Dot != -1) {