Skip to content

Eliminate the compiler warnings when implicit type conversion #503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zhangmcll wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Eliminate the compiler warnings when implicit type conversion #503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84a793f
Eliminate the warning when implicit type conversion
zhangmcll Sep 26, 2020
f4e0f3a
Remove extra Spaces
zhangmcll Sep 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion global.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ void Global::setup(StartupConfig startupConfig, bool guiAvailable) {
// QWebkit DPI is hard coded to 96. Hence, we calculate the correct
// font size based on desktop logical DPI.
settings->setFontSize(QWebSettings::DefaultFontSize,
defaultFontSize * (QApplication::desktop()->logicalDpiX() / 96.0)
int(defaultFontSize * (QApplication::desktop()->logicalDpiX() / 96.0))
);
}
if (defaultFont != "" && defaultFontSize <= 0 && this->guiAvailable) {
Expand Down
2 changes: 1 addition & 1 deletion main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ int main(int argc, char *argv[])
if (host.trimmed() != "")
proxy.setHostName(host.trimmed());
if (port > 0)
proxy.setPort(port);
proxy.setPort(quint16(port));
if (user.trimmed() != "")
proxy.setUser(user.trimmed());
if (password.trimmed() != "")
Expand Down