rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-02 10:24:11 +01:00
Code Issues Releases Activity

OP-1628 Uncrustify

Browse Source
This commit is contained in:
m_thread 2015-01-20 00:01:03 +01:00
parent fe404f1e33
commit e313d1ec67
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -498,6 +498,7 @@ void SetupWizard::pageChanged(int currId)
void SetupWizard::reboot() const void SetupWizard::reboot() const
{ {
SetupWizard *wiz = const_cast<SetupWizard *>(this); SetupWizard *wiz = const_cast<SetupWizard *>(this);
wiz->setWindowFlags(wiz->windowFlags() & ~Qt::WindowStaysOnTopHint); wiz->setWindowFlags(wiz->windowFlags() & ~Qt::WindowStaysOnTopHint);
ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance(); ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();

3
ground/openpilotgcs/src/plugins/uploader/rebootdialog.h
View File

@ -35,8 +35,7 @@ namespace Ui {
class RebootDialog; class RebootDialog;
} }
class RebootDialog : public QDialog class RebootDialog : public QDialog {
{
Q_OBJECT Q_OBJECT
public: public:

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

@ -552,6 +552,7 @@ void UploaderGadgetWidget::systemEraseBoot()
void UploaderGadgetWidget::rebootWithDialog() void UploaderGadgetWidget::rebootWithDialog()
{ {
RebootDialog dialog(this); RebootDialog dialog(this);
dialog.exec(); dialog.exec();
} }
@ -1014,6 +1015,7 @@ void UploaderGadgetWidget::autoUpdateStatus(uploader::ProgressStep status, QVari
{ {
QString msg; QString msg;
int remaining; int remaining;
switch (status) { switch (status) {
case uploader::WAITING_DISCONNECT: case uploader::WAITING_DISCONNECT:
m_config->autoUpdateLabel->setText(tr("Waiting for all OpenPilot boards to be disconnected from USB.")); m_config->autoUpdateLabel->setText(tr("Waiting for all OpenPilot boards to be disconnected from USB."));