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
a93f96da
Unverified
Commit
a93f96da
authored
Oct 25, 2018
by
Don Gagne
Committed by
GitHub
Oct 25, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #6943 from patrickelectric/better_qstring
Do not call QString(char*) to build empty string.
parents
bcabdc26
402add83
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
7 deletions
+7
-7
QGCQFileDialog.cc
src/QGCQFileDialog.cc
+2
-2
QGCMapUrlEngine.cpp
src/QtLocationPlugin/QGCMapUrlEngine.cpp
+2
-2
BluetoothLink.cc
src/comm/BluetoothLink.cc
+1
-1
TCPLink.cc
src/comm/TCPLink.cc
+1
-1
UDPLink.cc
src/comm/UDPLink.cc
+1
-1
No files found.
src/QGCQFileDialog.cc
View file @
a93f96da
...
...
@@ -159,7 +159,7 @@ QString QGCQFileDialog::getSaveFileName(
}
break
;
}
return
QString
(
""
)
;
return
{}
;
}
}
...
...
@@ -190,7 +190,7 @@ QString QGCQFileDialog::_getFirstExtensionInFilter(const QString& filter) {
return
match
.
captured
(
0
).
mid
(
2
);
}
}
return
QString
(
""
)
;
return
{}
;
}
/// @brief Validates and updates the parameters for the file dialog calls
...
...
src/QtLocationPlugin/QGCMapUrlEngine.cpp
View file @
a93f96da
...
...
@@ -435,7 +435,7 @@ UrlFactory::_getURL(MapType type, int x, int y, int zoom, QNetworkAccessManager*
int
y_max
=
26
*
pow
(
2
,
gap
)
+
(
2
*
gap
-
1
);
if
(
zoom
>
19
)
{
return
QString
(
""
)
;
return
{}
;
}
else
if
(
zoom
>
5
&&
x
>=
x_min
&&
x
<=
x_max
&&
y
>=
y_min
&&
y
<=
y_max
)
{
return
QString
(
"http://xdworld.vworld.kr:8080/2d/Base/service/%1/%2/%3.png"
).
arg
(
zoom
).
arg
(
x
).
arg
(
y
);
...
...
@@ -458,7 +458,7 @@ UrlFactory::_getURL(MapType type, int x, int y, int zoom, QNetworkAccessManager*
int
y_max
=
26
*
pow
(
2
,
gap
)
+
(
2
*
gap
-
1
);
if
(
zoom
>
19
)
{
return
QString
(
""
)
;
return
{}
;
}
else
if
(
zoom
>
5
&&
x
>=
x_min
&&
x
<=
x_max
&&
y
>=
y_min
&&
y
<=
y_max
)
{
return
QString
(
"http://xdworld.vworld.kr:8080/2d/Satellite/service/%1/%2/%3.jpeg"
).
arg
(
zoom
).
arg
(
x
).
arg
(
y
);
...
...
src/comm/BluetoothLink.cc
View file @
a93f96da
...
...
@@ -390,7 +390,7 @@ void BluetoothConfiguration::setDevName(const QString &name)
QString
BluetoothConfiguration
::
address
()
{
#ifdef __ios__
return
QString
(
""
)
;
return
{}
;
#else
return
_device
.
address
;
#endif
...
...
src/comm/TCPLink.cc
View file @
a93f96da
...
...
@@ -262,7 +262,7 @@ static QString get_ip_address(const QString& address)
}
}
}
return
QString
(
""
)
;
return
{}
;
}
TCPConfiguration
::
TCPConfiguration
(
const
QString
&
name
)
:
LinkConfiguration
(
name
)
...
...
src/comm/UDPLink.cc
View file @
a93f96da
...
...
@@ -65,7 +65,7 @@ static QString get_ip_address(const QString& address)
}
}
}
return
QString
(
""
)
;
return
{}
;
}
static
bool
contains_target
(
const
QList
<
UDPCLient
*>
list
,
const
QHostAddress
&
address
,
quint16
port
)
...
...
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