From 5e1b476c86d51ef3c40a5d097b633e4ffff7eb28 Mon Sep 17 00:00:00 2001 From: Nikolaj Schlej Date: Thu, 5 Dec 2013 11:53:24 +0100 Subject: [PATCH] Version 0.11.0.2 - Qt5 based building errors resolved --- ffsengine.cpp | 4 ++-- uefitool.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ffsengine.cpp b/ffsengine.cpp index a42a981..944670e 100644 --- a/ffsengine.cpp +++ b/ffsengine.cpp @@ -2243,7 +2243,7 @@ UINT8 FfsEngine::findTextPatternIn(const QModelIndex & index, const QString & pa if (unicode) data = QString::fromUtf16((const ushort*) item->body().data(), item->body().length()/2); else - data = QString::fromAscii((const char*) item->body().data(), item->body().length()); + data = QString::fromLatin1((const char*) item->body().data(), item->body().length()); int offset = -1; while ((offset = data.indexOf(pattern, offset + 1, caseSensitive)) >= 0) { @@ -2256,4 +2256,4 @@ UINT8 FfsEngine::findTextPatternIn(const QModelIndex & index, const QString & pa } return ERR_SUCCESS; -} \ No newline at end of file +} diff --git a/uefitool.cpp b/uefitool.cpp index 7a48df3..447e35b 100644 --- a/uefitool.cpp +++ b/uefitool.cpp @@ -85,8 +85,8 @@ void UEFITool::init() ui->structureTreeView->setModel(ffsEngine->model()); // Connect - connect(ui->structureTreeView, SIGNAL(collapsed(const QModelIndex &)), this, SLOT(resizeTreeViewColums(void))); - connect(ui->structureTreeView, SIGNAL(expanded(const QModelIndex &)), this, SLOT(resizeTreeViewColums(void))); + //connect(ui->structureTreeView, SIGNAL(collapsed(const QModelIndex &)), this, SLOT(resizeTreeViewColums(void))); + //connect(ui->structureTreeView, SIGNAL(expanded(const QModelIndex &)), this, SLOT(resizeTreeViewColums(void))); connect(ui->structureTreeView->selectionModel(), SIGNAL(currentChanged(const QModelIndex &, const QModelIndex &)), this, SLOT(populateUi(const QModelIndex &))); connect(ui->messageListWidget, SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, SLOT(scrollTreeView(QListWidgetItem*))); @@ -134,7 +134,7 @@ void UEFITool::search() int index = searchDialog->ui->dataTypeComboBox->currentIndex(); if (index == 0) { // Hex pattern - QByteArray pattern = QByteArray::fromHex(searchDialog->ui->searchEdit->text().toAscii()); + QByteArray pattern = QByteArray::fromHex(searchDialog->ui->searchEdit->text().toLatin1()); if (pattern.isEmpty()) return; ffsEngine->findHexPattern(pattern, searchDialog->ui->dataOnlyRadioButton->isChecked()); @@ -575,4 +575,4 @@ void UEFITool::writeSettings() settings.setValue("tree/columnWidth2", ui->structureTreeView->columnWidth(2)); settings.setValue("tree/columnWidth3", ui->structureTreeView->columnWidth(3)); //settings.setValue("tree/columnWidth4", ui->structureTreeView->columnWidth(4)); -} \ No newline at end of file +}