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
b7594100
Commit
b7594100
authored
Jul 17, 2014
by
Bryant Mairs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
APMToolBar no longer takes a parent QWidget argument.
parent
1d5b5b1b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
MainWindow.cc
src/ui/MainWindow.cc
+1
-1
apmtoolbar.cpp
src/ui/apmtoolbar.cpp
+1
-1
apmtoolbar.h
src/ui/apmtoolbar.h
+1
-1
No files found.
src/ui/MainWindow.cc
View file @
b7594100
...
...
@@ -263,7 +263,7 @@ void MainWindow::init()
if
(
getCustomMode
()
==
CUSTOM_MODE_APM
)
{
// Add the APM 'toolbar'
APMToolBar
*
apmToolBar
=
new
APMToolBar
(
this
);
APMToolBar
*
apmToolBar
=
new
APMToolBar
();
apmToolBar
->
setFlightViewAction
(
ui
.
actionFlightView
);
apmToolBar
->
setFlightPlanViewAction
(
ui
.
actionMissionView
);
apmToolBar
->
setHardwareViewAction
(
ui
.
actionHardwareConfig
);
...
...
src/ui/apmtoolbar.cpp
View file @
b7594100
...
...
@@ -7,7 +7,7 @@
#include "apmtoolbar.h"
APMToolBar
::
APMToolBar
(
QWidget
*
parent
)
:
APMToolBar
::
APMToolBar
()
:
QQuickView
(),
m_uas
(
0
)
{
// Configure our QML object
...
...
src/ui/apmtoolbar.h
View file @
b7594100
...
...
@@ -11,7 +11,7 @@ class APMToolBar : public QQuickView
{
Q_OBJECT
public:
explicit
APMToolBar
(
QWidget
*
parent
=
0
);
explicit
APMToolBar
();
~
APMToolBar
();
void
setFlightViewAction
(
QAction
*
action
);
...
...
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