Use size_t to represent counts and indices

[libs/gltk.git] / source / entry.cpp

diff --git a/source/entry.cpp b/source/entry.cpp
index b113b2040de556001b5a3e28e631761860eb0909..b212f5f6ecdf66a557ee614b37ca9cf0c1765089 100644 (file)
--- a/source/entry.cpp
+++ b/source/entry.cpp
@@ -51,7 +51,7 @@ void Entry::set_text(const string &t)
        set_edit_position(text.size());
 }
 
-void Entry::insert(unsigned pos, const string &t)
+void Entry::insert(size_t pos, const string &t)
 {
        if(t.empty())
                return;
@@ -66,7 +66,7 @@ void Entry::insert(unsigned pos, const string &t)
        mark_rebuild();
 }
 
-void Entry::erase(unsigned pos, unsigned len)
+void Entry::erase(size_t pos, size_t len)
 {
        if(!len)
                return;
@@ -81,7 +81,7 @@ void Entry::erase(unsigned pos, unsigned len)
        mark_rebuild();
 }
 
-bool Entry::get_selection(unsigned &start, unsigned &end) const
+bool Entry::get_selection(size_t &start, size_t &end) const
 {
        if(!selection_active)
                return false;
@@ -94,12 +94,12 @@ bool Entry::get_selection(unsigned &start, unsigned &end) const
        return true;
 }
 
-void Entry::translate_position(unsigned pos, unsigned &row, unsigned &col) const
+void Entry::translate_position(size_t pos, size_t &row, size_t &col) const
 {
        text.offset_to_coords(pos, row, col);
 }
 
-unsigned Entry::translate_position(unsigned row, unsigned col) const
+size_t Entry::translate_position(size_t row, size_t col) const
 {
        return text.coords_to_offset(row, col);
 }
@@ -139,7 +139,7 @@ void Entry::rebuild_special(const Part &part)
                if(!text_part || !graphic || !graphic->get_texture())
                        return;
 
-               unsigned row, col;
+               size_t row, col;
                text.offset_to_coords(edit_pos, row, col);
 
                if(row<first_row || row>=first_row+visible_rows)
@@ -160,12 +160,12 @@ void Entry::rebuild_special(const Part &part)
                if(!text_part || !graphic || !graphic->get_texture())
                        return;
 
-               unsigned start, end;
+               size_t start, end;
                get_selection(start, end);
 
-               unsigned row, col;
+               size_t row, col;
                text.offset_to_coords(start, row, col);
-               unsigned end_row, end_col;
+               size_t end_row, end_col;
                text.offset_to_coords(end, end_row, end_col);
 
                if(end_row<first_row || row>=first_row+visible_rows)
@@ -185,7 +185,7 @@ void Entry::rebuild_special(const Part &part)
 
                while(row<=end_row)
                {
-                       unsigned ec = (row==end_row ? end_col : text.get_line_length(row));
+                       size_t ec = (row==end_row ? end_col : text.get_line_length(row));
                        if(ec>col)
                        {
                                Geometry rgeom = text.coords_to_geometry(*text_part, geom, first_row, row, col);
@@ -234,7 +234,7 @@ bool Entry::key_press(unsigned key, unsigned mod)
                        erase_selection(true);
                else if(edit_pos>0)
                {
-                       unsigned start_pos = text.move_offset(edit_pos, -1);
+                       size_t start_pos = text.move_offset(edit_pos, -1);
                        erase(start_pos, edit_pos-start_pos);
                }
        }
@@ -244,7 +244,7 @@ bool Entry::key_press(unsigned key, unsigned mod)
                        erase_selection(true);
                else
                {
-                       unsigned end_pos = text.move_offset(edit_pos, 1);
+                       size_t end_pos = text.move_offset(edit_pos, 1);
                        erase(edit_pos, end_pos-edit_pos);
                }
        }
@@ -252,25 +252,25 @@ bool Entry::key_press(unsigned key, unsigned mod)
                insert(edit_pos, "\n");
        else if(key==Input::KEY_END)
        {
-               unsigned row, col;
+               size_t row, col;
                text.offset_to_coords(edit_pos, row, col);
                set_edit_position(text.coords_to_offset(row, text.get_line_length(row)), mod==MOD_SHIFT);
        }
        else if(key==Input::KEY_HOME)
        {
-               unsigned row, col;
+               size_t row, col;
                text.offset_to_coords(edit_pos, row, col);
                set_edit_position(text.coords_to_offset(row, 0), mod==MOD_SHIFT);
        }
        else if(key==Input::KEY_PGUP)
        {
-               unsigned row, col;
+               size_t row, col;
                text.offset_to_coords(edit_pos, row, col);
                set_edit_position(text.coords_to_offset((row<visible_rows ? 0 : row-visible_rows), col), mod==MOD_SHIFT);
        }
        else if(key==Input::KEY_PGDN)
        {
-               unsigned row, col;
+               size_t row, col;
                text.offset_to_coords(edit_pos, row, col);
                set_edit_position(text.coords_to_offset(row+visible_rows, col), mod==MOD_SHIFT);
        }
@@ -363,13 +363,13 @@ void Entry::move_edit_position(Navigation nav, bool select)
                set_edit_position(text.move_offset(edit_pos, 1), select);
        else if(nav==NAV_DOWN)
        {
-               unsigned row, col;
+               size_t row, col;
                text.offset_to_coords(edit_pos, row, col);
                set_edit_position(text.coords_to_offset(row+1, col), select);
        }
        else if(nav==NAV_UP)
        {
-               unsigned row, col;
+               size_t row, col;
                text.offset_to_coords(edit_pos, row, col);
                set_edit_position((row>0 ? text.coords_to_offset(row-1, col) : 0), select);
        }
@@ -377,10 +377,10 @@ void Entry::move_edit_position(Navigation nav, bool select)
                throw invalid_argument("Entry::move_edit_position");
 }
 
-void Entry::adjust_edit_position_for_change(unsigned pos, int change)
+void Entry::adjust_edit_position_for_change(size_t pos, ptrdiff_t change)
 {
-       unsigned old_edit_pos = edit_pos;
-       unsigned old_select_pos = selection_pos;
+       size_t old_edit_pos = edit_pos;
+       size_t old_select_pos = selection_pos;
 
        if(change>0)
        {
@@ -392,35 +392,35 @@ void Entry::adjust_edit_position_for_change(unsigned pos, int change)
        else if(change<0)
        {
                if(edit_pos>=pos)
-                       edit_pos -= min<unsigned>(edit_pos-pos, -change);
+                       edit_pos -= min<size_t>(edit_pos-pos, -change);
                if(selection_active && selection_pos>=pos)
-                       selection_pos -= min<unsigned>(selection_pos-pos, -change);
+                       selection_pos -= min<size_t>(selection_pos-pos, -change);
        }
 
        if(edit_pos!=old_edit_pos)
                signal_edit_position_changed.emit(edit_pos);
        if(selection_active && (edit_pos!=old_edit_pos || selection_pos!=old_select_pos))
        {
-               unsigned start, end;
+               size_t start, end;
                if(get_selection(start, end))
                        signal_selection_changed.emit(start, end);
        }
 }
 
-void Entry::set_edit_position(unsigned ep, bool select)
+void Entry::set_edit_position(size_t ep, bool select)
 {
        bool selection_was_active = selection_active;
        if(select && !selection_active)
                selection_pos = edit_pos;
        selection_active = select;
 
-       unsigned old_edit_pos = edit_pos;
+       size_t old_edit_pos = edit_pos;
        edit_pos = min(ep, text.size());
 
        if(edit_pos!=old_edit_pos)
        {
                signal_edit_position_changed.emit(edit_pos);
-               unsigned start, end;
+               size_t start, end;
                if(get_selection(start, end))
                        signal_selection_changed.emit(start, end);
                else if(selection_was_active)
@@ -434,7 +434,7 @@ void Entry::set_edit_position(unsigned ep, bool select)
 
 void Entry::erase_selection(bool emit_change)
 {
-       unsigned start, end;
+       size_t start, end;
        if(!get_selection(start, end))
                return;
 
@@ -470,16 +470,16 @@ void Entry::check_view_range()
 
        visible_rows = text.get_visible_lines(*text_part, geom, nullptr);
 
-       unsigned row, col;
+       size_t row, col;
        text.offset_to_coords(edit_pos, row, col);
 
-       unsigned old_first_row = first_row;
+       size_t old_first_row = first_row;
        if(first_row>row)
                first_row = row;
        else if(row>=first_row+visible_rows)
                first_row = row+1-visible_rows;
 
-       unsigned scroll = max(text.get_n_lines(), visible_rows)-visible_rows;
+       size_t scroll = max<size_t>(text.get_n_lines(), visible_rows)-visible_rows;
        if(first_row>scroll)
                first_row = scroll;
 
@@ -495,8 +495,8 @@ void Entry::slider_value_changed(double value)
 {
        if(text.get_n_lines()>visible_rows)
        {
-               unsigned old_first_row = first_row;
-               first_row = text.get_n_lines()-visible_rows-static_cast<unsigned>(value);
+               size_t old_first_row = first_row;
+               first_row = text.get_n_lines()-visible_rows-static_cast<size_t>(value);
                if(first_row!=old_first_row)
                        signal_scroll_position_changed.emit(first_row);
                mark_rebuild();