Skip to content

Commit

Permalink
Fix whitespace
Browse files Browse the repository at this point in the history
  • Loading branch information
t-sommer committed Aug 9, 2024
1 parent 2822786 commit 6325951
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
10 changes: 5 additions & 5 deletions fmusim-gui/MainWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ MainWindow::MainWindow(QWidget *parent)
connect(ui->showLogAction, &QAction::triggered, this, [this]() { setCurrentPage(ui->logPage); });
connect(ui->showPlotAction, &QAction::triggered, this, [this]() { setCurrentPage(ui->plotPage); });

connect(ui->compilePlatformBinaryAction, &QAction::triggered, this, &MainWindow::compilePlatformBinary);
connect(ui->buildPlatformBinaryAction, &QAction::triggered, this, &MainWindow::buildPlatformBinary);

setCurrentPage(ui->startPage);

Expand Down Expand Up @@ -364,7 +364,7 @@ void MainWindow::loadFMU(const QString &filename) {
hasSourceCode = true;
}

ui->compilePlatformBinaryAction->setEnabled(hasSourceCode);
ui->buildPlatformBinaryAction->setEnabled(hasSourceCode);

ui->showInfoAction->setEnabled(true);
ui->showSettingsAction->setEnabled(true);
Expand Down Expand Up @@ -444,7 +444,7 @@ void MainWindow::setColorScheme(Qt::ColorScheme colorScheme) {

// toolbar
ui->newWindowAction->setIcon(QIcon(":/buttons/" + theme + "/new-window.svg"));
ui->compilePlatformBinaryAction->setIcon(QIcon(":/buttons/" + theme + "/hammer.svg"));
ui->buildPlatformBinaryAction->setIcon(QIcon(":/buttons/" + theme + "/hammer.svg"));
ui->openFileAction->setIcon(QIcon(":/buttons/" + theme + "/folder-open.svg"));
ui->showInfoAction->setIcon(QIcon(":/buttons/" + theme + "/info.svg"));
ui->showSettingsAction->setIcon(QIcon(":/buttons/" + theme + "/gear.svg"));
Expand Down Expand Up @@ -822,7 +822,7 @@ void MainWindow::unloadFMU() {

ui->dockWidget->setHidden(true);

ui->compilePlatformBinaryAction->setEnabled(false);
ui->buildPlatformBinaryAction->setEnabled(false);
ui->showInfoAction->setEnabled(false);
ui->showSettingsAction->setEnabled(false);
ui->showFilesAction->setEnabled(false);
Expand Down Expand Up @@ -892,7 +892,7 @@ static QString wslPath(const QString& path) {
return p.trimmed();
}

void MainWindow::compilePlatformBinary() {
void MainWindow::buildPlatformBinary() {

BuildPlatformBinaryDialog dialog(this);

Expand Down
2 changes: 1 addition & 1 deletion fmusim-gui/MainWindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ private slots:
void removePlotVariable(const FMIModelVariable* variable);
void setOptionalColumnsVisible(bool visible);
void simulationFinished();
void compilePlatformBinary();
void buildPlatformBinary();

};
#endif // MAINWINDOW_H
8 changes: 4 additions & 4 deletions fmusim-gui/MainWindow.ui
Original file line number Diff line number Diff line change
Expand Up @@ -1056,7 +1056,7 @@
</attribute>
<addaction name="openFileAction"/>
<addaction name="newWindowAction"/>
<addaction name="compilePlatformBinaryAction"/>
<addaction name="buildPlatformBinaryAction"/>
<addaction name="separator"/>
<addaction name="showInfoAction"/>
<addaction name="showSettingsAction"/>
Expand Down Expand Up @@ -1236,16 +1236,16 @@
<enum>QAction::NoRole</enum>
</property>
</action>
<action name="compilePlatformBinaryAction">
<action name="buildPlatformBinaryAction">
<property name="icon">
<iconset resource="buttons.qrc">
<normaloff>:/buttons/dark/hammer.svg</normaloff>:/buttons/dark/hammer.svg</iconset>
</property>
<property name="text">
<string>Compile platform binary</string>
<string>Build platform binary</string>
</property>
<property name="toolTip">
<string>Compile platform binary</string>
<string>Build platform binary</string>
</property>
<property name="menuRole">
<enum>QAction::NoRole</enum>
Expand Down
4 changes: 2 additions & 2 deletions fmusim-gui/resources/fmi2Functions.h
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ extern "C" {


/*
Export FMI2 API functions on Windows and under GCC.
Export FMI2 API functions on Windows and under GCC.
This definition has been changed to always export the symbols.
*/
#if defined _WIN32 || defined __CYGWIN__
Expand All @@ -159,7 +159,7 @@ This definition has been changed to always export the symbols.
#endif


/*
/*
Macro to construct the real function name.
This definition has been changed to add no prefix.
*/
Expand Down

0 comments on commit 6325951

Please sign in to comment.