Skip to content

Commit fa3d1d5

Browse files
authored
Fix compiler warnings (#14721)
- Don't discard return value of `QFile::open`. - Don't redefine GC_THREADS in OMEdit testsuite.
1 parent c53e39c commit fa3d1d5

File tree

20 files changed

+112
-60
lines changed

20 files changed

+112
-60
lines changed

OMEdit/OMEditLIB/Annotations/ShapePropertiesDialog.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -870,9 +870,10 @@ bool ShapePropertiesDialog::applyShapeProperties()
870870
fileName = "";
871871
}
872872
QFile imageFile(fileName);
873-
imageFile.open(QIODevice::ReadOnly);
874-
QByteArray imageByteArray = imageFile.readAll();
875-
mpShapeAnnotation->setImageSource(imageByteArray.toBase64());
873+
if (imageFile.open(QIODevice::ReadOnly)) {
874+
QByteArray imageByteArray = imageFile.readAll();
875+
mpShapeAnnotation->setImageSource(imageByteArray.toBase64());
876+
}
876877
}
877878
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
878879
mpShapeAnnotation->setImage(mpPreviewImageLabel->pixmap(Qt::ReturnByValue).toImage());

OMEdit/OMEditLIB/MainWindow.cpp

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1414,16 +1414,20 @@ void MainWindow::exportModelToOMNotebook(LibraryTreeItem *pLibraryTreeItem)
14141414
mpProgressBar->setValue(value++);
14151415
// create a file object and write the xml in it.
14161416
QFile omnotebookFile(omnotebookFileName);
1417-
omnotebookFile.open(QIODevice::WriteOnly);
1418-
QTextStream textStream(&omnotebookFile);
1417+
if (omnotebookFile.open(QIODevice::WriteOnly)) {
1418+
QTextStream textStream(&omnotebookFile);
14191419
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
1420-
textStream.setEncoding(QStringConverter::Utf8);
1420+
textStream.setEncoding(QStringConverter::Utf8);
14211421
#else
1422-
textStream.setCodec(Helper::utf8.toUtf8().constData());
1422+
textStream.setCodec(Helper::utf8.toUtf8().constData());
14231423
#endif
1424-
textStream.setGenerateByteOrderMark(false);
1425-
textStream << xmlDocument.toString();
1426-
omnotebookFile.close();
1424+
textStream.setGenerateByteOrderMark(false);
1425+
textStream << xmlDocument.toString();
1426+
omnotebookFile.close();
1427+
} else {
1428+
QString msg = tr("Unable to open %1").arg(omnotebookFileName);
1429+
MessagesWidget::instance()->addGUIMessage(MessageItem(MessageItem::Modelica, msg, Helper::scriptingKind, Helper::errorLevel));
1430+
}
14271431
mpProgressBar->setValue(value++);
14281432
// hide the progressbar and clear the message in status bar
14291433
mpStatusBar->clearMessage();

OMEdit/OMEditLIB/Modeling/DocumentationWidget.cpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -728,15 +728,16 @@ void DocumentationWidget::updatePreviousNextButtons()
728728
void DocumentationWidget::writeDocumentationFile(QString documentation)
729729
{
730730
/* Create a local file with the html we want to view as otherwise JavaScript does not run properly. */
731-
mDocumentationFile.open(QIODevice::WriteOnly);
732-
QTextStream out(&mDocumentationFile);
731+
if (mDocumentationFile.open(QIODevice::WriteOnly)) {
732+
QTextStream out(&mDocumentationFile);
733733
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
734-
out.setEncoding(QStringConverter::Utf8);
734+
out.setEncoding(QStringConverter::Utf8);
735735
#else
736-
out.setCodec(Helper::utf8.toUtf8().constData());
736+
out.setCodec(Helper::utf8.toUtf8().constData());
737737
#endif
738-
out << documentation;
739-
mDocumentationFile.close();
738+
out << documentation;
739+
mDocumentationFile.close();
740+
}
740741
}
741742

742743
/*!

OMEdit/OMEditLIB/Modeling/ModelicaClassDialog.cpp

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -509,19 +509,25 @@ void OpenModelicaFile::convertModelicaFiles(QStringList filesAndDirectories, QSt
509509
void OpenModelicaFile::convertModelicaFile(QString fileName, QTextCodec *pCodec)
510510
{
511511
QFile file(fileName);
512-
file.open(QIODevice::ReadOnly);
513-
QString fileData(pCodec->toUnicode(file.readAll()));
514-
file.close();
515-
file.open(QIODevice::WriteOnly | QIODevice::Truncate);
516-
QTextStream out(&file);
512+
513+
if (file.open(QIODevice::ReadOnly))
514+
{
515+
QString fileData(pCodec->toUnicode(file.readAll()));
516+
file.close();
517+
518+
if (file.open(QIODevice::WriteOnly | QIODevice::Truncate))
519+
{
520+
QTextStream out(&file);
517521
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
518-
out.setEncoding(QStringConverter::Utf8);
522+
out.setEncoding(QStringConverter::Utf8);
519523
#else
520-
out.setCodec(Helper::utf8.toUtf8().constData());
524+
out.setCodec(Helper::utf8.toUtf8().constData());
521525
#endif
522-
out.setGenerateByteOrderMark(false);
523-
out << fileData;
524-
file.close();
526+
out.setGenerateByteOrderMark(false);
527+
out << fileData;
528+
file.close();
529+
}
530+
}
525531
}
526532

527533
/*!

OMEdit/OMEditLIB/Plotting/VariablesWidget.cpp

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1848,16 +1848,20 @@ void VariablesWidget::updateInitXmlFile(VariablesTreeItem *pVariablesTreeItem, S
18481848
.arg(initFile.fileName()), Helper::scriptingKind, Helper::errorLevel));
18491849
}
18501850
initFile.close();
1851-
initFile.open(QIODevice::WriteOnly | QIODevice::Truncate);
1852-
QTextStream textStream(&initFile);
1851+
if (initFile.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
1852+
QTextStream textStream(&initFile);
18531853
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
1854-
textStream.setEncoding(QStringConverter::Utf8);
1854+
textStream.setEncoding(QStringConverter::Utf8);
18551855
#else
1856-
textStream.setCodec(Helper::utf8.toUtf8().constData());
1856+
textStream.setCodec(Helper::utf8.toUtf8().constData());
18571857
#endif
1858-
textStream.setGenerateByteOrderMark(false);
1859-
textStream << initXmlDocument.toString();
1860-
initFile.close();
1858+
textStream.setGenerateByteOrderMark(false);
1859+
textStream << initXmlDocument.toString();
1860+
initFile.close();
1861+
} else {
1862+
MessagesWidget::instance()->addGUIMessage(MessageItem(MessageItem::Modelica, GUIMessages::getMessage(GUIMessages::ERROR_OPENING_FILE).arg(initFile.fileName())
1863+
.arg(initFile.errorString()), Helper::scriptingKind, Helper::errorLevel));
1864+
}
18611865
} else {
18621866
MessagesWidget::instance()->addGUIMessage(MessageItem(MessageItem::Modelica, GUIMessages::getMessage(GUIMessages::ERROR_OPENING_FILE).arg(initFile.fileName())
18631867
.arg(initFile.errorString()), Helper::scriptingKind, Helper::errorLevel));

OMEdit/OMEditLIB/Simulation/SimulationOutputWidget.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -469,8 +469,7 @@ void SimulationOutputWidget::addGeneratedFileTab(QString fileName)
469469
{
470470
QFile file(fileName);
471471
QFileInfo fileInfo(fileName);
472-
if (file.exists()) {
473-
file.open(QIODevice::ReadOnly);
472+
if (file.open(QIODevice::ReadOnly)) {
474473
BaseEditor *pEditor;
475474
if (Utilities::isCFile(fileInfo.suffix())) {
476475
pEditor = new CEditor(MainWindow::instance());

OMEdit/OMEditLIB/TransformationalDebugger/TransformationsWidget.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1238,10 +1238,9 @@ void TransformationsWidget::fetchEquationData(int equationIndex)
12381238
}
12391239
}
12401240
QFile file(fileName);
1241-
if (file.exists()) {
1241+
if (file.open(QIODevice::ReadOnly)) {
12421242
mpTSourceEditorFileLabel->setText(file.fileName());
12431243
mpTSourceEditorFileLabel->show();
1244-
file.open(QIODevice::ReadOnly);
12451244
mpTransformationsEditor->getPlainTextEdit()->setPlainText(QString(file.readAll()));
12461245
mpTSourceEditorInfoBar->hide();
12471246
file.close();
@@ -1385,10 +1384,9 @@ void TransformationsWidget::fetchVariableData(const QModelIndex &index)
13851384
}
13861385
}
13871386
QFile file(fileName);
1388-
if (file.exists()) {
1387+
if (file.open(QIODevice::ReadOnly)) {
13891388
mpTSourceEditorFileLabel->setText(file.fileName());
13901389
mpTSourceEditorFileLabel->show();
1391-
file.open(QIODevice::ReadOnly);
13921390
mpTransformationsEditor->getPlainTextEdit()->setPlainText(QString(file.readAll()));
13931391
mpTSourceEditorInfoBar->hide();
13941392
file.close();

OMEdit/Testsuite/AutoCompletion/AutoCompletionTest.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@
3939
#include "Editors/ModelicaEditor.h"
4040
#include "Modeling/LibraryTreeWidget.h"
4141

42+
#ifndef GC_THREADS
4243
#define GC_THREADS
44+
#endif
4345
extern "C" {
4446
#include "meta/meta_modelica.h"
4547
}

OMEdit/Testsuite/BrowseMSL/BrowseMSL.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@
3838
#include "MainWindow.h"
3939
#include "Modeling/LibraryTreeWidget.h"
4040

41+
#ifndef GC_THREADS
4142
#define GC_THREADS
43+
#endif
4244
extern "C" {
4345
#include "meta/meta_modelica.h"
4446
}

OMEdit/Testsuite/Diagram/Diagram.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@
3838
#include "MainWindow.h"
3939
#include "Modeling/LibraryTreeWidget.h"
4040

41+
#ifndef GC_THREADS
4142
#define GC_THREADS
43+
#endif
4244
extern "C" {
4345
#include "meta/meta_modelica.h"
4446
}

0 commit comments

Comments
 (0)