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
48fc09ea
Unverified
Commit
48fc09ea
authored
May 26, 2020
by
Don Gagne
Committed by
GitHub
May 26, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #8758 from patrickelectric/fix_more_and_more_deprecated
Fix more and more deprecated issues
parents
64712c25
9552d964
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
7 deletions
+4
-7
QGCCameraControl.cc
src/Camera/QGCCameraControl.cc
+2
-4
PlanMasterController.cc
src/MissionManager/PlanMasterController.cc
+1
-1
QGCTileCacheWorker.cpp
src/QtLocationPlugin/QGCTileCacheWorker.cpp
+1
-2
No files found.
src/Camera/QGCCameraControl.cc
View file @
48fc09ea
...
...
@@ -164,7 +164,7 @@ QGCCameraControl::QGCCameraControl(const mavlink_camera_information_t *info, Veh
_vendor
=
QString
(
reinterpret_cast
<
const
char
*>
(
info
->
vendor_name
));
_modelName
=
QString
(
reinterpret_cast
<
const
char
*>
(
info
->
model_name
));
int
ver
=
static_cast
<
int
>
(
_info
.
cam_definition_version
);
_cacheFile
.
sprintf
(
"%s/%s_%s_%03d.xml"
,
_cacheFile
=
QString
::
a
sprintf
(
"%s/%s_%s_%03d.xml"
,
qgcApp
()
->
toolbox
()
->
settingsManager
()
->
appSettings
()
->
parameterSavePath
().
toStdString
().
c_str
(),
_vendor
.
toStdString
().
c_str
(),
_modelName
.
toStdString
().
c_str
(),
...
...
@@ -228,9 +228,7 @@ QGCCameraControl::firmwareVersion()
int
major
=
(
_info
.
firmware_version
>>
24
)
&
0xFF
;
int
minor
=
(
_info
.
firmware_version
>>
16
)
&
0xFF
;
int
build
=
_info
.
firmware_version
&
0xFFFF
;
QString
ver
;
ver
.
sprintf
(
"%d.%d.%d"
,
major
,
minor
,
build
);
return
ver
;
return
QString
::
asprintf
(
"%d.%d.%d"
,
major
,
minor
,
build
);
}
//-----------------------------------------------------------------------------
...
...
src/MissionManager/PlanMasterController.cc
View file @
48fc09ea
...
...
@@ -403,7 +403,7 @@ void PlanMasterController::loadFromFile(const QString& filename)
}
if
(
success
){
_currentPlanFile
.
sprintf
(
"%s/%s.%s"
,
fileInfo
.
path
().
toLocal8Bit
().
data
(),
fileInfo
.
completeBaseName
().
toLocal8Bit
().
data
(),
AppSettings
::
planFileExtension
);
_currentPlanFile
=
QString
::
a
sprintf
(
"%s/%s.%s"
,
fileInfo
.
path
().
toLocal8Bit
().
data
(),
fileInfo
.
completeBaseName
().
toLocal8Bit
().
data
(),
AppSettings
::
planFileExtension
);
}
else
{
_currentPlanFile
.
clear
();
}
...
...
src/QtLocationPlugin/QGCTileCacheWorker.cpp
View file @
48fc09ea
...
...
@@ -736,8 +736,7 @@ QGCCacheWorker::_importSets(QGCMapTask* mtask)
int
testCount
=
0
;
//-- Set with this name already exists. Make name unique.
while
(
true
)
{
QString
testName
;
testName
.
sprintf
(
"%s %02d"
,
name
.
toLatin1
().
data
(),
++
testCount
);
auto
testName
=
QString
::
asprintf
(
"%s %02d"
,
name
.
toLatin1
().
data
(),
++
testCount
);
if
(
!
_findTileSetID
(
testName
,
insertSetID
)
||
testCount
>
99
)
{
name
=
testName
;
break
;
...
...
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