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
5204aaba
Commit
5204aaba
authored
Dec 04, 2014
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove multiple activeUASSet overrides
This allows use of compile time Object::connect syntax
parent
4bd4091b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
0 additions
and
5 deletions
+0
-5
MockUASManager.cc
src/qgcunittest/MockUASManager.cc
+0
-1
MockUASManager.h
src/qgcunittest/MockUASManager.h
+0
-1
UASManager.cc
src/uas/UASManager.cc
+0
-1
UASManagerInterface.h
src/uas/UASManagerInterface.h
+0
-2
No files found.
src/qgcunittest/MockUASManager.cc
View file @
5204aaba
...
...
@@ -50,7 +50,6 @@ void MockUASManager::setMockActiveUAS(MockUAS* mockUAS)
{
// We don't support swiching between different UAS
//_mockUAS->setSelected();
emit
activeUASSet
(
_mockUAS
->
getUASID
());
emit
activeUASStatusChanged
(
_mockUAS
,
true
);
emit
activeUASStatusChanged
(
_mockUAS
->
getUASID
(),
true
);
}
...
...
src/qgcunittest/MockUASManager.h
View file @
5204aaba
...
...
@@ -41,7 +41,6 @@ class MockUASManager : public UASManagerInterface
signals:
// The following signals from UASManager interface are supported:
// void activeUASSet(UASInterface* UAS);
// void activeUASSet(int systemId);
// void activeUASStatusChanged(UASInterface* UAS, bool active);
// void activeUASStatusChanged(int systemId, bool active);
...
...
src/uas/UASManager.cc
View file @
5204aaba
...
...
@@ -473,7 +473,6 @@ void UASManager::setActiveUAS(UASInterface* uas)
if
(
activeUAS
)
{
activeUAS
->
setSelected
();
emit
activeUASSet
(
activeUAS
->
getUASID
());
emit
activeUASSetListIndex
(
systems
.
indexOf
(
activeUAS
));
emit
activeUASStatusChanged
(
activeUAS
,
true
);
emit
activeUASStatusChanged
(
activeUAS
->
getUASID
(),
true
);
...
...
src/uas/UASManagerInterface.h
View file @
5204aaba
...
...
@@ -105,8 +105,6 @@ signals:
/** @brief The UAS currently under main operator control changed */
void
activeUASSet
(
UASInterface
*
UAS
);
/** @brief The UAS currently under main operator control changed */
void
activeUASSet
(
int
systemId
);
/** @brief The UAS currently under main operator control changed */
void
activeUASSetListIndex
(
int
listIndex
);
/** @brief The UAS currently under main operator control changed */
void
activeUASStatusChanged
(
UASInterface
*
UAS
,
bool
active
);
...
...
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