Skip to content

Commit

Permalink
Fixed windows compile showstopper
Browse files Browse the repository at this point in the history
  • Loading branch information
grodansparadis committed Feb 4, 2025
1 parent 2572f13 commit 632e5ba
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 7 deletions.
3 changes: 2 additions & 1 deletion src/bootloaderwizard.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,9 @@

#include <list>
#include <string>
#include <QUrl>
#include <QShortcut>

#include <QDesktopServices>
#include <QStandardPaths>

#include <spdlog/async.h>
Expand Down
7 changes: 4 additions & 3 deletions src/cdlgconnsettingssocketcan.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -570,8 +570,6 @@ CDlgConnSettingsSocketCan::onTestConnection(void)
}
}

#endif // WIN32

///////////////////////////////////////////////////////////////////////////////
// showHelp
//
Expand All @@ -581,4 +579,7 @@ CDlgConnSettingsSocketCan::showHelp()
{
QString link = "https://grodansparadis.github.io/vscp-works-qt/#/connections?id=socketcan";
QDesktopServices::openUrl(QUrl(link));
}
}

#endif // !WIN32

2 changes: 1 addition & 1 deletion src/cdlgconnsettingssocketcan.h
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,6 @@ class CDlgConnSettingsSocketCan : public QDialog
vscpClientSocketCan m_clientSocketcan;
};

#endif // WIN32
#endif // !WIN32

#endif // CDLGCONNSETTINGSSOCKETCAN_H
2 changes: 1 addition & 1 deletion src/cdlgmdfbitlist.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,7 @@ CDlgMdfBitList::deleteRegisterBit(void)
else {
sel = idx + 1;
}
ui->listBits->setCurrentRow(sel);
ui->listBits->setCurrentRow((int)sel);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/cdlgmdfvaluelist.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ CDlgMdfValueList::deleteValue(void)
else {
sel = idx + 1;
}
ui->listValues->setCurrentRow(sel);
ui->listValues->setCurrentRow((int)sel);
}
}

Expand Down

0 comments on commit 632e5ba

Please sign in to comment.