Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
29c9afb3
Commit
29c9afb3
authored
Feb 12, 2016
by
Don Gagne
Browse files
Merge pull request #2783 from DonLakeFlyer/ConnectSlot
Fix bad connection
parents
427ad724
660272a4
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/ui/uas/UASQuickView.cc
View file @
29c9afb3
...
...
@@ -41,7 +41,7 @@ UASQuickView::UASQuickView(QWidget *parent) : QWidget(parent),
QAction
*
action
=
new
QAction
(
"Add/Remove Items"
,
this
);
action
->
setCheckable
(
false
);
connect
(
action
,
&
QAction
::
triggered
,
this
,
static_cast
<
void
(
UASQuickView
::*
)(
bool
)
>
(
&
UASQuickView
::
actionTriggered
)
)
;
connect
(
action
,
&
QAction
::
triggered
,
this
,
&
UASQuickView
::
a
ddA
ctionTriggered
);
this
->
addAction
(
action
);
QAction
*
columnaction
=
new
QAction
(
"Set Column Count"
,
this
);
...
...
@@ -75,7 +75,7 @@ void UASQuickView::columnActionTriggered()
saveSettings
();
}
void
UASQuickView
::
actionTriggered
()
void
UASQuickView
::
a
ddA
ctionTriggered
()
{
if
(
quickViewSelectDialog
)
{
...
...
src/ui/uas/UASQuickView.h
View file @
29c9afb3
...
...
@@ -61,7 +61,7 @@ signals:
public
slots
:
void
valueChanged
(
const
int
uasid
,
const
QString
&
name
,
const
QString
&
unit
,
const
QVariant
&
value
,
const
quint64
msecs
);
void
actionTriggered
(
bool
checked
);
void
actionTriggered
();
void
a
ddA
ctionTriggered
();
void
updateTimerTick
();
void
selectDialogClosed
();
void
valueEnabled
(
QString
value
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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