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

Uncrustify

Browse Source
This commit is contained in:
Fredrik Larson 2014-09-03 02:46:26 +10:00
parent 6243cad768
commit 650cbd3b52
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ground/openpilotgcs/src/plugins/welcome/welcomemode.cpp
View File

@ -83,17 +83,14 @@ WelcomeMode::WelcomeMode() :
QNetworkAccessManager *networkAccessManager = new QNetworkAccessManager; QNetworkAccessManager *networkAccessManager = new QNetworkAccessManager;
// Only attempt to request our version info if the network is accessible // Only attempt to request our version info if the network is accessible
if(networkAccessManager->networkAccessible() == QNetworkAccessManager::Accessible) if (networkAccessManager->networkAccessible() == QNetworkAccessManager::Accessible) {
{
connect(networkAccessManager, SIGNAL(finished(QNetworkReply *)), this, SLOT(networkResponseReady(QNetworkReply *))); connect(networkAccessManager, SIGNAL(finished(QNetworkReply *)), this, SLOT(networkResponseReady(QNetworkReply *)));
// This will delete the network access manager instance when we're done // This will delete the network access manager instance when we're done
connect(networkAccessManager, SIGNAL(finished(QNetworkReply *)), networkAccessManager, SLOT(deleteLater())); connect(networkAccessManager, SIGNAL(finished(QNetworkReply *)), networkAccessManager, SLOT(deleteLater()));
networkAccessManager->get(QNetworkRequest(QUrl("http://www.openpilot.org/opver"))); networkAccessManager->get(QNetworkRequest(QUrl("http://www.openpilot.org/opver")));
} } else {
else
{
// No network, can delete this now as we don't need it. // No network, can delete this now as we don't need it.
delete networkAccessManager; delete networkAccessManager;
} }
@ -160,15 +157,13 @@ void WelcomeMode::triggerAction(const QString &actionId)
void WelcomeMode::networkResponseReady(QNetworkReply *reply) void WelcomeMode::networkResponseReady(QNetworkReply *reply)
{ {
if(reply != NULL) if (reply != NULL) {
{
QString version(reply->readAll()); QString version(reply->readAll());
version = version.trimmed(); version = version.trimmed();
reply->deleteLater(); reply->deleteLater();
if(version != VersionInfo::tagOrHash8()) if (version != VersionInfo::tagOrHash8()) {
{
m_newVersionText = tr("Update Available: %1").arg(version); m_newVersionText = tr("Update Available: %1").arg(version);
emit newVersionTextChanged(); emit newVersionTextChanged();
} }

3
ground/openpilotgcs/src/plugins/welcome/welcomemode.h
View File

@ -45,8 +45,7 @@ namespace Welcome {
struct WelcomeModePrivate; struct WelcomeModePrivate;
class WELCOME_EXPORT WelcomeMode : public Core::IMode { class WELCOME_EXPORT WelcomeMode : public Core::IMode {
Q_OBJECT Q_OBJECT Q_PROPERTY(QString versionString READ versionString)
Q_PROPERTY(QString versionString READ versionString)
Q_PROPERTY(QString newVersionText READ newVersionText NOTIFY newVersionTextChanged) Q_PROPERTY(QString newVersionText READ newVersionText NOTIFY newVersionTextChanged)
public: public: