ch0ic3/cutter
1
0
Fork 0
mirror of https://github.com/rizinorg/cutter.git synced 2025-01-19 02:48:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Warning removals

Browse Source
This commit is contained in:
xarkes 2018-01-27 16:10:41 +01:00
parent 372021dadc
commit 98c6c0a56e
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/widgets/HexdumpWidget.cpp
View File

@ -308,7 +308,6 @@ void HexdumpWidget::refresh(RVA addr)
ui->hexHexText->setText(hexdump[1]); ui->hexHexText->setText(hexdump[1]);
ui->hexASCIIText->setText(hexdump[2]); ui->hexASCIIText->setText(hexdump[2]);
QTextBlock blockText = ui->hexHexText->document()->findBlockByLineNumber(bufferLines);
QTextCursor cursor(ui->hexHexText->document()->findBlockByLineNumber(bufferLines)); // ln-1 because line number starts from 0 QTextCursor cursor(ui->hexHexText->document()->findBlockByLineNumber(bufferLines)); // ln-1 because line number starts from 0
ui->hexHexText->moveCursor(QTextCursor::End); ui->hexHexText->moveCursor(QTextCursor::End);
ui->hexHexText->setTextCursor(cursor); ui->hexHexText->setTextCursor(cursor);
@ -536,7 +535,6 @@ void HexdumpWidget::selectionChanged()
int startPosition = hexAddressToPosition(startAddress); int startPosition = hexAddressToPosition(startAddress);
int endPosition = hexAddressToPosition(endAddress); int endPosition = hexAddressToPosition(endAddress);
QChar endChar = ui->hexHexText->document()->characterAt(endPosition);
// End position -1 because the position we get above is for the next // End position -1 because the position we get above is for the next
// entry, so including the space/newline // entry, so including the space/newline
@ -794,7 +792,7 @@ void HexdumpWidget::setTextEditPosition(QTextEdit *textEdit, int position)
int HexdumpWidget::getDisplayedLined(QTextEdit *textEdit, bool bottom) int HexdumpWidget::getDisplayedLined(QTextEdit *textEdit, bool bottom)
{ {
int start_pos = textEdit->cursorForPosition(QPoint(0, 0)).position(); //int start_pos = textEdit->cursorForPosition(QPoint(0, 0)).position();
QPoint top_right(textEdit->viewport()->x(), textEdit->viewport()->y()); QPoint top_right(textEdit->viewport()->x(), textEdit->viewport()->y());
QPoint bottom_right(textEdit->viewport()->width(), textEdit->viewport()->height() - 1); QPoint bottom_right(textEdit->viewport()->width(), textEdit->viewport()->height() - 1);
QPoint point = top_right; QPoint point = top_right;
@ -804,10 +802,10 @@ int HexdumpWidget::getDisplayedLined(QTextEdit *textEdit, bool bottom)
} }
QTextCursor textCursor = textEdit->cursorForPosition(point); QTextCursor textCursor = textEdit->cursorForPosition(point);
QTextBlock textBlock = textCursor.block(); //QTextBlock textBlock = textCursor.block();
QTextLayout *textLayout = textBlock.layout(); //QTextLayout *textLayout = textBlock.layout();
const int relativePos = textCursor.position() - textBlock.position(); //const int relativePos = textCursor.position() - textBlock.position();
int end_pos = textEdit->cursorForPosition(bottom_right).position(); //int end_pos = textEdit->cursorForPosition(bottom_right).position();
return textCursor.blockNumber(); return textCursor.blockNumber();
} }
@ -849,7 +847,7 @@ void HexdumpWidget::prependWithoutScroll(QTextEdit *textEdit, QString text)
QTextCursor textCursor = textEdit->textCursor(); QTextCursor textCursor = textEdit->textCursor();
int current_positon = textCursor.position(); int current_positon = textCursor.position();
int scroll_max_before = textEdit->verticalScrollBar()->maximum(); //int scroll_max_before = textEdit->verticalScrollBar()->maximum();
int scroll_val_before = textEdit->verticalScrollBar()->value(); int scroll_val_before = textEdit->verticalScrollBar()->value();
int height_before = textEdit->document()->size().height(); int height_before = textEdit->document()->size().height();
textEdit->moveCursor(QTextCursor::Start); textEdit->moveCursor(QTextCursor::Start);
@ -857,8 +855,8 @@ void HexdumpWidget::prependWithoutScroll(QTextEdit *textEdit, QString text)
textCursor.setPosition(text.length() + current_positon); textCursor.setPosition(text.length() + current_positon);
textEdit->setTextCursor(textCursor); textEdit->setTextCursor(textCursor);
int height_after = textEdit->document()->size().height(); int height_after = textEdit->document()->size().height();
int scroll_max_after = textEdit->verticalScrollBar()->maximum(); //int scroll_max_after = textEdit->verticalScrollBar()->maximum();
int scroll_val_after = textEdit->verticalScrollBar()->maximum(); //int scroll_val_after = textEdit->verticalScrollBar()->maximum();
textEdit->verticalScrollBar()->setValue(scroll_val_before + (height_after - height_before)); textEdit->verticalScrollBar()->setValue(scroll_val_before + (height_after - height_before));
} }