Skip to content

Conversation

Munkybooty
Copy link

…citly on Windows

bb6ca65 gui: get special folder in unicode (Chun Kuan Lee)
1c5d225 Drop boost::scoped_array (Chun Kuan Lee)

Pull request description:

Drop boost::scoped_array and simplify the code.

TCHAR should be defined as wchar_t if UNICODE is defined. So we can use .toStdWString().c_str() to get wchar_t C-style string.

Fix bitcoin#13819

Tree-SHA512: 3fd4aa784129c9d1576b01e6ee27faa42d793e152d132f2dde504d917dad3a8e95e065fcbc54a3895d74fb6b2a9ed4f5ec67d893395552f585e225486a84a454

Conflicts:

src/qt/guiutil.cpp

@Munkybooty Munkybooty force-pushed the backports-0.18-pr7.1 branch from 3f79d48 to 4749c7e Compare July 13, 2021 02:01
@Munkybooty Munkybooty changed the title Merge #13734: gui: Drop boost::scoped_array and use wchar_t API expli… Backport Merge #13877 Jul 13, 2021
…-8 string on Windows

2c3eade Make fs::path::string() always return utf-8 string (Chun Kuan Lee)

Pull request description:

  Imbue `fs::path` with `std::codecvt_utf8_utf16` at `SetupEnvironment()`, so that default string encoding will be utf-8 inside `fs::path`.

Tree-SHA512: 0cb59464d777278decbf24771fc5ff0cb2caa7bc2fe8ee5cd36c97a2324873a3caad131f08f050393b488316ee7f4ab0b28b7fa4699e41839f8e51b9867d5118

# Conflicts:
#	src/qt/guiutil.cpp
@Munkybooty Munkybooty force-pushed the backports-0.18-pr7.1 branch from 4749c7e to e8c2117 Compare July 13, 2021 13:52
@PastaPastaPasta PastaPastaPasta changed the title Backport Merge #13877 Merge bitcoin#13877: utils: Make fs::path::string() always return utf-8 string on Windows Jul 13, 2021
@PastaPastaPasta PastaPastaPasta marked this pull request as ready for review July 13, 2021 17:12
Copy link
Member

@PastaPastaPasta PastaPastaPasta left a comment

Choose a reason for hiding this comment

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

utACK

@PastaPastaPasta PastaPastaPasta requested a review from UdjinM6 July 13, 2021 17:12
Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

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

utACK

@UdjinM6 UdjinM6 added this to the 18 milestone Jul 13, 2021
@UdjinM6 UdjinM6 merged commit 6aea990 into dashpay:develop Jul 13, 2021
@Munkybooty Munkybooty deleted the backports-0.18-pr7.1 branch November 30, 2021 03:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants