ch0ic3/cutter
1
0
Fork 0
mirror of https://github.com/rizinorg/cutter.git synced 2024-12-24 05:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Qt 5.13 deprecations (#1641)

Browse Source
This commit is contained in:
Florian Märkl 2019-07-09 20:55:07 +02:00 committed by GitHub
parent 68a864ee0a
commit 78ff1459c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/Configuration.cpp
View File

@ -543,7 +543,7 @@ QStringList Configuration::getAvailableTranslations()
} }
QStringList fileNames = fileNamesSet.toList(); QStringList fileNames = fileNamesSet.toList();
qSort(fileNames); std::sort(fileNames.begin(), fileNames.end());
QStringList languages; QStringList languages;
QString currLanguageName; QString currLanguageName;
auto allLocales = QLocale::matchingLocales(QLocale::AnyLanguage, QLocale::AnyScript, auto allLocales = QLocale::matchingLocales(QLocale::AnyLanguage, QLocale::AnyScript,

2
src/core/Cutter.h
View File

@ -373,7 +373,7 @@ public:
QList<VariableDescription> getVariables(RVA at); QList<VariableDescription> getVariables(RVA at);
QList<XrefDescription> getXRefs(RVA addr, bool to, bool whole_function, QList<XrefDescription> getXRefs(RVA addr, bool to, bool whole_function,
const QString &filterType = QString::null); const QString &filterType = QString());
QList<StringDescription> parseStringsJson(const QJsonDocument &doc); QList<StringDescription> parseStringsJson(const QJsonDocument &doc);

2
src/dialogs/NewFileDialog.cpp
View File

@ -284,7 +284,7 @@ bool NewFileDialog::fillRecentFilesList()
} else { } else {
QListWidgetItem *item = new QListWidgetItem( QListWidgetItem *item = new QListWidgetItem(
getIconFor(name, i++), getIconFor(name, i++),
file + "\nCreated: " + info.created().toString() + "\nSize: " + qhelpers::formatBytecount( file + "\nCreated: " + info.birthTime().toString() + "\nSize: " + qhelpers::formatBytecount(
info.size()) info.size())
); );
//":/img/icons/target.svg"), name ); //":/img/icons/target.svg"), name );

1
src/dialogs/XrefsDialog.cpp
View File

@ -11,7 +11,6 @@
XrefsDialog::XrefsDialog(QWidget *parent) : XrefsDialog::XrefsDialog(QWidget *parent) :
QDialog(parent), QDialog(parent),
addr(0), addr(0),
func_name(QString::null),
ui(new Ui::XrefsDialog) ui(new Ui::XrefsDialog)
{ {
ui->setupUi(this); ui->setupUi(this);

2
src/widgets/HexWidget.cpp
View File

@ -1224,7 +1224,7 @@ QRectF HexWidget::itemRectangle(uint offset)
x -= charWidth / 2; x -= charWidth / 2;
width += charWidth / 2; width += charWidth / 2;
} }
if (offset == itemGroupByteLen() - 1) { if (static_cast<int>(offset) == itemGroupByteLen() - 1) {
width += charWidth / 2; width += charWidth / 2;
} }