Skip to content
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.

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

Two small clean-ups #2102

Merged
merged 3 commits into from
Dec 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 0 additions & 2 deletions client/client_main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -304,10 +304,8 @@ static void client_game_reset()
int client_main(int argc, char *argv[])
{
QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
QApplication::setHighDpiScaleFactorRoundingPolicy(
Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
#endif
QApplication app(argc, argv);
QCoreApplication::setApplicationVersion(freeciv21_version());
app.setDesktopFileName(QStringLiteral("net.longturn.freeciv21"));
Expand Down
4 changes: 2 additions & 2 deletions client/renderer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,8 @@ void renderer::unqueue_updates()
} else {
QRectF to_update;

for (const auto [tile, upd_types] : updates) {
for (const auto [type, rect] : rects) {
for (const auto &[tile, upd_types] : updates) {
for (const auto &[type, rect] : rects) {
if (upd_types & type) {
float xl, yt;
(void) tile_to_canvas_pos(&xl, &yt, tile);
Expand Down
3 changes: 0 additions & 3 deletions utility/cmake_fc_config.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,6 @@
/* bzlib.h available */
#cmakedefine HAVE_BZLIB_H

/* direct.h available */
#cmakedefine HAVE_DIRECT_H

/* dlfcn.h available */
#cmakedefine HAVE_DLFCN_H

Expand Down
3 changes: 0 additions & 3 deletions utility/shared.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@
#include <lmcons.h> // UNLEN
#include <shlobj.h>
#include <windows.h>
#ifdef HAVE_DIRECT_H
#include <direct.h>
#endif // HAVE_DIRECT_H
#else // FREECIV_MSWINDOWS
#include <unistd.h> // getuid, geteuid
#endif // FREECIV_MSWINDOWS
Expand Down
Loading