Skip to content

Remove QTextCodec usage. #1043

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
acolwell merged 1 commit into from
May 5, 2025
Merged

Remove QTextCodec usage. #1043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion Engine/AppManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@
#include <QDateTime>
#include <QDebug>
#include <QDir>
#include <QTextCodec>
#include <QCoreApplication>
#include <QSettings>
#include <QThreadPool>
Expand Down
11 changes: 5 additions & 6 deletions Gui/AboutWindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ CLANG_DIAG_OFF(deprecated)
#include <QVBoxLayout>
#include <QTabWidget>
#include <QFile>
#include <QTextCodec>
#include <QItemSelectionModel>
#include <QHeaderView>
#include <QDir>
Expand Down Expand Up @@ -130,7 +129,7 @@ AboutWindow::AboutWindow(QWidget* parent)
QString licenseStr;
QFile license( QString::fromUtf8(":LICENSE_SHORT.txt") );
license.open(QIODevice::ReadOnly | QIODevice::Text);
licenseStr = NATRON_NAMESPACE::convertFromPlainText(QTextCodec::codecForName("UTF-8")->toUnicode( license.readAll() ), NATRON_NAMESPACE::WhiteSpaceNormal);
licenseStr = NATRON_NAMESPACE::convertFromPlainText(QString::fromUtf8( license.readAll() ), NATRON_NAMESPACE::WhiteSpaceNormal);
aboutText.append(licenseStr);
}
{
Expand Down Expand Up @@ -445,7 +444,7 @@ AboutWindow::AboutWindow(QWidget* parent)
{
QFile changelogFile( QString::fromUtf8(":CHANGELOG.md") );
changelogFile.open(QIODevice::ReadOnly | QIODevice::Text);
_changelogText->setText( QTextCodec::codecForName("UTF-8")->toUnicode( changelogFile.readAll() ) );
_changelogText->setText( QString::fromUtf8( changelogFile.readAll() ) );
}
_tabWidget->addTab( _changelogText, tr("Changelog") );

Expand All @@ -460,7 +459,7 @@ AboutWindow::AboutWindow(QWidget* parent)
{
QFile team_file( QString::fromUtf8(":CONTRIBUTORS.txt") );
team_file.open(QIODevice::ReadOnly | QIODevice::Text);
_teamText->setText( QTextCodec::codecForName("UTF-8")->toUnicode( team_file.readAll() ) );
_teamText->setText( QString::fromUtf8( team_file.readAll() ) );
}
_tabWidget->addTab( _teamText, tr("Contributors") );

Expand All @@ -469,7 +468,7 @@ AboutWindow::AboutWindow(QWidget* parent)
{
QFile license( QString::fromUtf8(":LICENSE.txt") );
license.open(QIODevice::ReadOnly | QIODevice::Text);
_licenseText->setText( QTextCodec::codecForName("UTF-8")->toUnicode( license.readAll() ) );
_licenseText->setText( QString::fromUtf8( license.readAll() ) );
}
_tabWidget->addTab( _licenseText, tr("License") );

Expand Down Expand Up @@ -563,7 +562,7 @@ AboutWindow::onSelectionChanged(const QItemSelection & newSelection,
fileName += ( item->text() == QString::fromUtf8("README") ) ? QString::fromUtf8(".md") : QString::fromUtf8(".txt");
QFile file(fileName);
if ( file.open(QIODevice::ReadOnly | QIODevice::Text) ) {
QString content = QTextCodec::codecForName("UTF-8")->toUnicode( file.readAll() );
QString content = QString::fromUtf8( file.readAll() );
_thirdPartyBrowser->setText(content);
}
}
Expand Down