Just being really OCD.

qgroundcontrol.pro

@@ -334,7 +334,7 @@ HEADERS += \
     src/uas/UAS.h \
     src/uas/UASInterface.h \
     src/uas/UASMessageHandler.h \
-    src/Vehicle/MavlinkLogManager.h \
+    src/Vehicle/MAVLinkLogManager.h \
     src/ui/toolbar/MainToolBarController.h \
     src/AutoPilotPlugins/PX4/PX4AirframeLoader.h \
     src/AutoPilotPlugins/APM/APMAirframeLoader.h \
@@ -499,7 +499,7 @@ SOURCES += \
     src/QmlControls/QmlObjectListModel.cc \
     src/uas/UAS.cc \
     src/uas/UASMessageHandler.cc \
-    src/Vehicle/MavlinkLogManager.cc \
+    src/Vehicle/MAVLinkLogManager.cc \
     src/ui/toolbar/MainToolBarController.cc \
     src/AutoPilotPlugins/PX4/PX4AirframeLoader.cc \
     src/AutoPilotPlugins/APM/APMAirframeLoader.cc \

src/QGCToolbox.cc

@@ -28,7 +28,7 @@
 #include "FollowMe.h"
 #include "PositionManager.h"
 #include "VideoManager.h"
-#include "MavlinkLogManager.h"
+#include "MAVLinkLogManager.h"
 
 QGCToolbox::QGCToolbox(QGCApplication* app)
     : _audioOutput(NULL)
@@ -73,7 +73,7 @@ QGCToolbox::QGCToolbox(QGCApplication* app)
     _qgcPositionManager =       new QGCPositionManager(app);
     _followMe =                 new FollowMe(app);
     _videoManager =             new VideoManager(app);
-    _mavlinkLogManager =        new MavlinkLogManager(app);
+    _mavlinkLogManager =        new MAVLinkLogManager(app);
 }
 
 void QGCToolbox::setChildToolboxes(void)

src/QGCToolbox.h

@@ -32,7 +32,7 @@ class QGCImageProvider;
 class UASMessageHandler;
 class QGCPositionManager;
 class VideoManager;
-class MavlinkLogManager;
+class MAVLinkLogManager;
 
 /// This is used to manage all of our top level services/tools
 class QGCToolbox {
@@ -57,7 +57,7 @@ public:
     FollowMe*                   followMe(void)                  { return _followMe; }
     QGCPositionManager*         qgcPositionManager(void)        { return _qgcPositionManager; }
     VideoManager*               videoManager(void)              { return _videoManager; }
-    MavlinkLogManager*          mavlinkLogManager(void)         { return _mavlinkLogManager; }
+    MAVLinkLogManager*          mavlinkLogManager(void)         { return _mavlinkLogManager; }
 
 #ifndef __mobile__
     GPSManager*                 gpsManager(void)                { return _gpsManager; }
@@ -86,7 +86,7 @@ private:
     FollowMe*                   _followMe;
     QGCPositionManager*         _qgcPositionManager;
     VideoManager*               _videoManager;
-    MavlinkLogManager*          _mavlinkLogManager;
+    MAVLinkLogManager*          _mavlinkLogManager;
 
     friend class QGCApplication;
 };

src/QmlControls/QGroundControlQmlGlobal.h

@@ -72,7 +72,7 @@ public:
     Q_PROPERTY(QGCPositionManager*  qgcPositionManger   READ qgcPositionManger      CONSTANT)
     Q_PROPERTY(MissionCommandTree*  missionCommandTree  READ missionCommandTree     CONSTANT)
     Q_PROPERTY(VideoManager*        videoManager        READ videoManager           CONSTANT)
-    Q_PROPERTY(MavlinkLogManager*   mavlinkLogManager   READ mavlinkLogManager      CONSTANT)
+    Q_PROPERTY(MAVLinkLogManager*   mavlinkLogManager   READ mavlinkLogManager      CONSTANT)
 
     Q_PROPERTY(qreal                zOrderTopMost       READ zOrderTopMost          CONSTANT) ///< z order for top most items, toolbar, main window sub view
     Q_PROPERTY(qreal                zOrderWidgets       READ zOrderWidgets          CONSTANT) ///< z order value to widgets, for example: zoom controls, hud widgetss
@@ -167,7 +167,7 @@ public:
     QGCPositionManager*     qgcPositionManger   ()      { return _qgcPositionManager; }
     MissionCommandTree*     missionCommandTree  ()      { return _missionCommandTree; }
     VideoManager*           videoManager        ()      { return _videoManager; }
-    MavlinkLogManager*      mavlinkLogManager   ()      { return _mavlinkLogManager; }
+    MAVLinkLogManager*      mavlinkLogManager   ()      { return _mavlinkLogManager; }
 
     qreal                   zOrderTopMost       ()      { return 1000; }
     qreal                   zOrderWidgets       ()      { return 100; }
@@ -239,7 +239,7 @@ private:
     QGCPositionManager*     _qgcPositionManager;
     MissionCommandTree*     _missionCommandTree;
     VideoManager*           _videoManager;
-    MavlinkLogManager*      _mavlinkLogManager;
+    MAVLinkLogManager*      _mavlinkLogManager;
 
     bool                    _virtualTabletJoystick;
     qreal                   _baseFontPointSize;

src/Vehicle/MavlinkLogManager.h → src/Vehicle/MAVLinkLogManager.h

@@ -8,8 +8,8 @@
  ****************************************************************************/
 
 
-#ifndef MavlinkLogManager_H
-#define MavlinkLogManager_H
+#ifndef MAVLinkLogManager_H
+#define MAVLinkLogManager_H
 
 #include <QObject>
 
@@ -18,17 +18,17 @@
 #include "QGCToolbox.h"
 #include "Vehicle.h"
 
-Q_DECLARE_LOGGING_CATEGORY(MavlinkLogManagerLog)
+Q_DECLARE_LOGGING_CATEGORY(MAVLinkLogManagerLog)
 
 class QNetworkAccessManager;
-class MavlinkLogManager;
+class MAVLinkLogManager;
 
 //-----------------------------------------------------------------------------
-class MavlinkLogFiles : public QObject
+class MAVLinkLogFiles : public QObject
 {
     Q_OBJECT
 public:
-    MavlinkLogFiles    (MavlinkLogManager* manager, const QString& filePath, bool newFile = false);
+    MAVLinkLogFiles    (MAVLinkLogManager* manager, const QString& filePath, bool newFile = false);
 
     Q_PROPERTY(QString      name        READ    name                                CONSTANT)
     Q_PROPERTY(quint32      size        READ    size                                NOTIFY sizeChanged)
@@ -62,7 +62,7 @@ signals:
     void        uploadedChanged     ();
 
 private:
-    MavlinkLogManager*  _manager;
+    MAVLinkLogManager*  _manager;
     QString             _name;
     quint32             _size;
     bool                _selected;
@@ -73,15 +73,15 @@ private:
 };
 
 //-----------------------------------------------------------------------------
-class MavlinkLogProcessor
+class MAVLinkLogProcessor
 {
 public:
-    MavlinkLogProcessor();
-    ~MavlinkLogProcessor();
+    MAVLinkLogProcessor();
+    ~MAVLinkLogProcessor();
     void                close       ();
     bool                valid       ();
-    bool                create      (MavlinkLogManager *manager, const QString path, uint8_t id);
-    MavlinkLogFiles*    record      () { return _record; }
+    bool                create      (MAVLinkLogManager *manager, const QString path, uint8_t id);
+    MAVLinkLogFiles*    record      () { return _record; }
     QString             fileName    () { return _fileName; }
     bool                processStreamData(uint16_t _sequence, uint8_t first_message, QByteArray data);
 private:
@@ -97,17 +97,17 @@ private:
     bool                _error;
     QByteArray          _ulogMessage;
     QString             _fileName;
-    MavlinkLogFiles*    _record;
+    MAVLinkLogFiles*    _record;
 };
 
 //-----------------------------------------------------------------------------
-class MavlinkLogManager : public QGCTool
+class MAVLinkLogManager : public QGCTool
 {
     Q_OBJECT
 
 public:
-    MavlinkLogManager    (QGCApplication* app);
-    ~MavlinkLogManager   ();
+    MAVLinkLogManager    (QGCApplication* app);
+    ~MAVLinkLogManager   ();
 
     Q_PROPERTY(QString              emailAddress        READ    emailAddress        WRITE setEmailAddress       NOTIFY emailAddressChanged)
     Q_PROPERTY(QString              description         READ    description         WRITE setDescription        NOTIFY descriptionChanged)
@@ -180,8 +180,8 @@ private:
     bool _processUploadResponse     (int http_code, QByteArray &data);
     bool _createNewLog              ();
     int  _getFirstSelected          ();
-    void _insertNewLog              (MavlinkLogFiles* newLog);
-    void _deleteLog                 (MavlinkLogFiles* log);
+    void _insertNewLog              (MAVLinkLogFiles* newLog);
+    void _deleteLog                 (MAVLinkLogFiles* log);
     void _discardLog                ();
     QString _makeFilename           (const QString& baseName);
 
@@ -194,11 +194,11 @@ private:
     bool                    _enableAutoStart;
     QNetworkAccessManager*  _nam;
     QmlObjectListModel      _logFiles;
-    MavlinkLogFiles*        _currentLogfile;
+    MAVLinkLogFiles*        _currentLogfile;
     Vehicle*                _vehicle;
     bool                    _logRunning;
     bool                    _loggingDisabled;
-    MavlinkLogProcessor*    _logProcessor;
+    MAVLinkLogProcessor*    _logProcessor;
     bool                    _deleteAfterUpload;
     int                     _loggingCmdTryCount;
     QTimer                  _ackTimer;

src/ui/preferences/MavlinkSettings.qml

@@ -144,7 +144,7 @@ Rectangle {
                 anchors.horizontalCenter: parent.horizontalCenter
                 QGCLabel {
                     id:             mavlogLabel
-                    text:           qsTr("Vehicle Mavlink Logging")
+                    text:           qsTr("Vehicle MAVLink Logging")
                     font.family:    ScreenTools.demiboldFontFamily
                 }
             }