8000 Remove implicit QChar conversions by TheComputerGuy96 · Pull Request #778 · Sigil-Ebook/Sigil · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Remove implicit QChar conversions #778

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

Merged
merged 2 commits into from
Oct 19, 2024
Merged

Remove implicit QChar conversions #778

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
9b2773e
cmake: Don't set the QT_IMPLICIT_QCHAR_CONSTRUCTION macro
TheComputerGuy96 Oct 19, 2024
08ed327
Parsers: Make QChar conversions explicit
TheComputerGuy96 Oct 19, 2024
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 src/Parsers/qCSSParser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ QString CSSParser::unicode(QString& istring, int& i)
(CSSUtils::hexdec(add) > 96 && CSSUtils::hexdec(add) < 123))
{
QString msg = "Replaced unicode notation: Changed \\" + CSSUtils::rtrim(add) + " to ";
add = static_cast<int>(CSSUtils::hexdec(add));
add = QChar(static_cast<int>(CSSUtils::hexdec(add)));
msg += add;
log(msg,Information);
replaced = true;
Expand Down
4 changes: 2 additions & 2 deletions src/Parsers/qCSSUtils.cpp
View file
Open in desktop
8000
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ QChar CSSUtils::s_at(const QString &istring, const int pos)
{
if(pos > (istring.length()-1) || pos < 0)
{
return 0;
return QChar(0);
}
else
{
Expand Down Expand Up @@ -168,7 +168,7 @@ QString CSSUtils::build_value(const QVector<QString> subvalues)

bool CSSUtils::ctype_space(const QChar c)
{
return (c == ' ' || c == '\t' || c == '\r' || c == '\n' || c == 11);
return (c == ' ' || c == '\t' || c == '\r' || c == '\n' || c == QChar(11));
}


Expand Down
4 changes: 0 additions & 4 deletions src/qt6sigil.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
# Build Sigil against Qt6 - requires cmake 3.16+ and a C++17 compiler
#############################################################################

# quiet Qt 6 deprecat4ed warnings
# add_definitions(-DQT_NO_DEPRECATED_WARNINGS)
add_definitions(-DQT_IMPLICIT_QCHAR_CONSTRUCTION)

if (CMAKE_VERSION VERSION_GREATER "3.27.9")
cmake_policy(SET CMP0153 OLD)
endif()
Expand Down
0