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.

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

Jump to bottom

Use QTextStream to read input files #1618

Merged
merged 1 commit into from
Dec 21, 2022
Merged

Use QTextStream to read input files #1618

merged 1 commit into from
Dec 21, 2022

Conversation

lmoureaux
Copy link
Contributor

It's more reliable than manual new line parsing, especially with Windows-style CRLF come into play.

Closes #1087.

Test:

  • Convert helpdata.txt to DOS format
  • Start the client
  • Open Help > About Freeciv21
  • Reproduce 1087 without the patch and not with the patch

@lmoureaux
Use QTextStream to read input files
45008e8 
It's more reliable than manual new line parsing, especially with Windows-style
CRLF come into play.

Closes longturn#1087.
@lmoureaux lmoureaux requested a review from jwrober December 20, 2022 23:54
jwrober
jwrober approved these changes Dec 21, 2022
View reviewed changes
Copy link
Collaborator

@jwrober jwrober left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works like a champ.

@jwrober jwrober merged commit c81a4e3 into longturn:master Dec 21, 2022
@lmoureaux lmoureaux mentioned this pull request Jan 4, 2023
Closed
@lmoureaux lmoureaux deleted the bugfix/newline-encoding branch January 4, 2023 03:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jwrober jwrober jwrober approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Version number in "About Freeciv21" doesn't appear correct
2 participants
@lmoureaux @jwrober