UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-29 19:49:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

[escher] Fix signed/unsigned comparison warning

Browse Source 
Change-Id: I3278e2e1a951475f96adae4f0c6ba6b6b52a170e
This commit is contained in:
Léa Saviot
2018-05-16 10:39:28 +02:00
committed by Ecco
parent b94c247c6a
commit 40d9fc4c42
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
escher/include/escher/text_area.h
View File

@@ -66,7 +66,7 @@ private:
void insertChar(char c, size_t index);
char removeChar(size_t index);
int removeRemainingLine(size_t index, int direction);
size_t removeRemainingLine(size_t index, int direction);
char operator[](size_t index) {
assert(index < m_bufferSize);
return m_buffer[index];

8
escher/src/text_area.cpp
View File

@@ -107,14 +107,14 @@ char TextArea::Text::removeChar(size_t index) {
return deletedChar;
}
int TextArea::Text::removeRemainingLine(size_t index, int direction) {
size_t TextArea::Text::removeRemainingLine(size_t index, int direction) {
assert(m_buffer != nullptr);
assert(index < m_bufferSize);
int jump = index;
while (m_buffer[jump] != '\n' && m_buffer[jump] != 0 && jump >= 0) {
jump += direction;
}
int delta = direction > 0 ? jump - index : index - jump;
size_t delta = direction > 0 ? jump - index : index - jump;
if (delta == 0) {
return 0;
}
@@ -240,7 +240,7 @@ bool TextArea::TextArea::ContentView::removeChar() {
}
bool TextArea::ContentView::removeEndOfLine() {
int removedLine = m_text.removeRemainingLine(cursorLocation(), 1);
size_t removedLine = m_text.removeRemainingLine(cursorLocation(), 1);
if (removedLine > 0) {
layoutSubviews();
reloadRectFromCursorPosition(cursorLocation(), false);
@@ -253,7 +253,7 @@ bool TextArea::ContentView::removeStartOfLine() {
if (cursorLocation() <= 0) {
return false;
}
int removedLine = m_text.removeRemainingLine(cursorLocation()-1, -1);
size_t removedLine = m_text.removeRemainingLine(cursorLocation()-1, -1);
if (removedLine > 0) {
assert(m_cursorIndex >= removedLine);
setCursorLocation(cursorLocation()-removedLine);