Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
6226743f
Commit
6226743f
authored
Nov 29, 2017
by
Beat Küng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rebase fixup: remove AirMapController.{cc,h}
parent
0a18238a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
0 additions
and
7 deletions
+0
-7
qgroundcontrol.pro
qgroundcontrol.pro
+0
-2
QGCApplication.cc
src/QGCApplication.cc
+0
-2
Vehicle.cc
src/Vehicle/Vehicle.cc
+0
-1
Vehicle.h
src/Vehicle/Vehicle.h
+0
-2
No files found.
qgroundcontrol.pro
View file @
6226743f
...
...
@@ -500,7 +500,6 @@ HEADERS += \
src
/
LogCompressor
.
h
\
src
/
MG
.
h
\
src
/
MissionManager
/
CameraCalc
.
h
\
src
/
MissionManager
/
AirMapController
.
h
\
src
/
MissionManager
/
AirspaceController
.
h
\
src
/
MissionManager
/
AirMapManager
.
h
\
src
/
MissionManager
/
AirspaceManagement
.
h
\
...
...
@@ -720,7 +719,6 @@ SOURCES += \
src
/
JsonHelper
.
cc
\
src
/
LogCompressor
.
cc
\
src
/
MissionManager
/
CameraCalc
.
cc
\
src
/
MissionManager
/
AirMapController
.
cc
\
src
/
MissionManager
/
AirspaceController
.
cc
\
src
/
MissionManager
/
AirMapManager
.
cc
\
src
/
MissionManager
/
AirspaceManagement
.
cc
\
...
...
src/QGCApplication.cc
View file @
6226743f
...
...
@@ -83,7 +83,6 @@
#include "QGCCameraManager.h"
#include "CameraCalc.h"
#include "VisualMissionItem.h"
#include "AirMapController.h"
#include "AirspaceController.h"
#ifndef NO_SERIAL_LINK
...
...
@@ -362,7 +361,6 @@ void QGCApplication::_initCommon(void)
qmlRegisterUncreatableType
<
ParameterManager
>
(
"QGroundControl.Vehicle"
,
1
,
0
,
"ParameterManager"
,
"Reference only"
);
qmlRegisterUncreatableType
<
QGCCameraManager
>
(
"QGroundControl.Vehicle"
,
1
,
0
,
"QGCCameraManager"
,
"Reference only"
);
qmlRegisterUncreatableType
<
QGCCameraControl
>
(
"QGroundControl.Vehicle"
,
1
,
0
,
"QGCCameraControl"
,
"Reference only"
);
qmlRegisterUncreatableType
<
AirMapController
>
(
"QGroundControl.Vehicle"
,
1
,
0
,
"AirMapController"
,
"Reference only"
);
qmlRegisterUncreatableType
<
AirspaceController
>
(
"QGroundControl.Vehicle"
,
1
,
0
,
"AirspaceController"
,
"Reference only"
);
qmlRegisterUncreatableType
<
JoystickManager
>
(
"QGroundControl.JoystickManager"
,
1
,
0
,
"JoystickManager"
,
"Reference only"
);
qmlRegisterUncreatableType
<
Joystick
>
(
"QGroundControl.JoystickManager"
,
1
,
0
,
"Joystick"
,
"Reference only"
);
...
...
src/Vehicle/Vehicle.cc
View file @
6226743f
...
...
@@ -33,7 +33,6 @@
#include "QGCCorePlugin.h"
#include "ADSBVehicle.h"
#include "QGCCameraManager.h"
#include "AirMapController.h"
#include "AirspaceController.h"
QGC_LOGGING_CATEGORY
(
VehicleLog
,
"VehicleLog"
)
...
...
src/Vehicle/Vehicle.h
View file @
6226743f
...
...
@@ -36,7 +36,6 @@ class UASMessage;
class
SettingsManager
;
class
ADSBVehicle
;
class
QGCCameraManager
;
class
AirMapController
;
class
AirspaceController
;
Q_DECLARE_LOGGING_CATEGORY
(
VehicleLog
)
...
...
@@ -323,7 +322,6 @@ public:
Q_PROPERTY
(
QVariantList
staticCameraList
READ
staticCameraList
CONSTANT
)
Q_PROPERTY
(
QGCCameraManager
*
dynamicCameras
READ
dynamicCameras
NOTIFY
dynamicCamerasChanged
)
Q_PROPERTY
(
QString
hobbsMeter
READ
hobbsMeter
NOTIFY
hobbsMeterChanged
)
Q_PROPERTY
(
AirMapController
*
airMapController
READ
airMapController
CONSTANT
)
Q_PROPERTY
(
AirspaceAuthorization
::
PermitStatus
flightPermitStatus
READ
flightPermitStatus
NOTIFY
flightPermitStatusChanged
)
///< state of flight permission
Q_PROPERTY
(
AirspaceController
*
airspaceController
READ
airspaceController
CONSTANT
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment