rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-18 08:54:15 +01:00
Code Issues Releases Activity

OP-1628 Uncrustify

Browse Source
This commit is contained in:
m_thread 2014-12-09 00:50:26 +01:00
parent cb1d9586eb
commit ff1ad84302
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ground/openpilotgcs/src/plugins/setupwizard/pages/autoupdatepage.cpp
View File

@ -38,6 +38,7 @@ void AutoUpdatePage::enableButtons(bool enable = false)
void AutoUpdatePage::autoUpdate()
{
ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
Q_ASSERT(pm);
UploaderGadgetFactory *uploader = pm->getObject<UploaderGadgetFactory>();
Q_ASSERT(uploader);

10
ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
View File

@ -619,6 +619,7 @@ bool UploaderGadgetWidget::autoUpdateCapable()
bool UploaderGadgetWidget::autoUpdate(bool erase)
{
ResultEventLoop eventLoop;
connect(this, SIGNAL(bootloaderSuccess()), &eventLoop, SLOT(success()));
connect(this, SIGNAL(bootloaderFailed()), &eventLoop, SLOT(fail()));
@ -1053,17 +1054,20 @@ int UploaderGadgetWidget::cannotResetMessageBox()
}
int ResultEventLoop::run(int millisTimout) {
int ResultEventLoop::run(int millisTimout)
{
m_timer.singleShot(millisTimout, this, SLOT(fail()));
return exec();
}
void ResultEventLoop::success() {
void ResultEventLoop::success()
{
m_timer.stop();
exit(0);
}
void ResultEventLoop::fail() {
void ResultEventLoop::fail()
{
m_timer.stop();
exit(-1);
}